From 8d879b174357c742bf4962a7a67edb60cb08e1df Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Wed, 22 Jun 2016 10:12:23 +0000 Subject: [PATCH] Initial import. git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/ckan-connector@129271 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/LICENSE | 4 - distro/README | 66 -------- distro/changelog.xml | 6 - distro/descriptor.xml | 32 ---- distro/profile.xml | 26 ---- .../data/analysis/rconnector/TEstAcazzo.java | 97 ------------ .../data/analysis/rconnector/TestCall.java | 22 --- pom.xml | 141 ------------------ resources/digest.py | 35 ----- resources/logback.xml | 16 -- .../access/ckanconnector/CKanConnector.java | 15 -- .../ckanconnector/ConnectorManager.java | 99 ------------ .../ckanconnector/OrganizationManager.java | 85 ----------- .../access/ckanconnector/RandomString.java | 33 ---- src/main/resources/digest.py | 35 ----- src/main/resources/inactivesession.html | 4 - src/main/resources/logout.html | 8 - src/main/resources/open.html | 13 -- src/main/webapp/WEB-INF/gcube-app.xml | 8 - src/main/webapp/WEB-INF/web.xml | 29 ---- .../data/access/ckanconnector/TestCall.java | 44 ------ src/test/resources/logback.xml | 16 -- 22 files changed, 834 deletions(-) delete mode 100644 distro/LICENSE delete mode 100644 distro/README delete mode 100644 distro/changelog.xml delete mode 100644 distro/descriptor.xml delete mode 100644 distro/profile.xml delete mode 100644 java/org/gcube/data/analysis/rconnector/TEstAcazzo.java delete mode 100644 java/org/gcube/data/analysis/rconnector/TestCall.java delete mode 100644 pom.xml delete mode 100644 resources/digest.py delete mode 100644 resources/logback.xml delete mode 100644 src/main/java/org/gcube/data/access/ckanconnector/CKanConnector.java delete mode 100644 src/main/java/org/gcube/data/access/ckanconnector/ConnectorManager.java delete mode 100644 src/main/java/org/gcube/data/access/ckanconnector/OrganizationManager.java delete mode 100644 src/main/java/org/gcube/data/access/ckanconnector/RandomString.java delete mode 100644 src/main/resources/digest.py delete mode 100644 src/main/resources/inactivesession.html delete mode 100644 src/main/resources/logout.html delete mode 100644 src/main/resources/open.html delete mode 100644 src/main/webapp/WEB-INF/gcube-app.xml delete mode 100644 src/main/webapp/WEB-INF/web.xml delete mode 100644 src/test/java/org/gcube/data/access/ckanconnector/TestCall.java delete mode 100644 src/test/resources/logback.xml diff --git a/distro/LICENSE b/distro/LICENSE deleted file mode 100644 index cdf50bd..0000000 --- a/distro/LICENSE +++ /dev/null @@ -1,4 +0,0 @@ -gCube System - License ------------------------------------------------------------- - -${gcube.license} \ No newline at end of file diff --git a/distro/README b/distro/README deleted file mode 100644 index a61347f..0000000 --- a/distro/README +++ /dev/null @@ -1,66 +0,0 @@ -The gCube System - ${name} --------------------------------------------------- - -${description} - - -${gcube.description} - -${gcube.funding} - - -Version --------------------------------------------------- - -${version} (${buildDate}) - -Please see the file named "changelog.xml" in this directory for the release notes. - - -Authors --------------------------------------------------- - -* Lucio Lelii (lucio.lelii@isti.cnr.it), CNR, Italy - - -Maintainers ------------ - -* Lucio Lelii (lucio.lelii@isti.cnr.it), CNR, Italy - - -Download information --------------------------------------------------- - -Source code is available from SVN: - ${scm.url} - -Binaries can be downloaded from the gCube website: - ${gcube.website} - - -Installation --------------------------------------------------- - -Installation documentation is available on-line in the gCube Wiki: - ${gcube.wikiRoot} - - -Documentation --------------------------------------------------- - -Documentation is available on-line in the gCube Wiki: - ${gcube.wikiRoot} - - -Support --------------------------------------------------- - -Bugs and support requests can be reported in the gCube issue tracking tool: - ${gcube.issueTracking} - - -Licensing --------------------------------------------------- - -This software is licensed under the terms you may find in the file named "LICENSE" in this directory. \ No newline at end of file diff --git a/distro/changelog.xml b/distro/changelog.xml deleted file mode 100644 index 5365517..0000000 --- a/distro/changelog.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - First Release - - \ No newline at end of file diff --git a/distro/descriptor.xml b/distro/descriptor.xml deleted file mode 100644 index e395580..0000000 --- a/distro/descriptor.xml +++ /dev/null @@ -1,32 +0,0 @@ - - servicearchive - - tar.gz - - / - - - ${distroDirectory} - / - true - - README - LICENSE - changelog.xml - profile.xml - - 755 - true - - - - - target/${build.finalName}.${project.packaging} - /${artifactId} - - - - \ No newline at end of file diff --git a/distro/profile.xml b/distro/profile.xml deleted file mode 100644 index a96f3dc..0000000 --- a/distro/profile.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - Service - - ${description} - DataAccess - ${artifactId} - 1.0.0 - - - ${artifactId} - ${version} - - ${groupId} - ${artifactId} - ${version} - - - ${build.finalName}.war - - - - - - diff --git a/java/org/gcube/data/analysis/rconnector/TEstAcazzo.java b/java/org/gcube/data/analysis/rconnector/TEstAcazzo.java deleted file mode 100644 index d210021..0000000 --- a/java/org/gcube/data/analysis/rconnector/TEstAcazzo.java +++ /dev/null @@ -1,97 +0,0 @@ -package org.gcube.data.analysis.rconnector; - -import java.security.MessageDigest; - -import org.junit.Test; -import org.python.core.PyCode; -import org.python.core.PyObject; -import org.python.core.PyString; -import org.python.util.PythonInterpreter; - -import java.io.*; -public class TEstAcazzo { - - @Test - public void test() throws Exception{ - String secret = "Ew2DCqvvavzBx7fKFPWwKhNKN"; - String digest0 = encodeTimestamp("0.0.0.0", 1458818509l)+secret+"user_vre_two_editor"+'\0'+'\0'+"userid_type:unicode"; - String timestamp16 = Long.toString(1458818509l, 16); - System.out.println(digest0); - System.out.println(digest0.length()); - MessageDigest mg = MessageDigest.getInstance("MD5"); - String digestResult = toHexString(mg.digest(digest0.getBytes())); - System.out.println(digestResult); - String finalDigest = toHexString(mg.digest((digestResult+secret).getBytes())); - System.out.println(finalDigest); - System.out.println(finalDigest.length()); - System.out.println(timestamp16); - } - - @Test - public void python() throws Exception{ - PythonInterpreter interpreter = new PythonInterpreter(); - interpreter.execfile(new FileInputStream(new File(this.getClass().getClassLoader().getResource("digest.py").getFile()))); - PyObject someFunc = interpreter.get("calculate_digest"); - System.out.println(" someFunc is null ?"+(someFunc==null)); - PyObject ret = someFunc.__call__(new PyObject[]{new PyString("0.0.0.0"), new PyString("1458818509"), new PyString("Ew2DCqvvavzBx7fKFPWwKhNKN"), - new PyString("user_vre_two_editor"), new PyString(""), new PyString("userid_type:unicode")} ); - String realResult = (String) ret.__tojava__(String.class); - System.out.println("result is "+realResult); - } - - - public String encodeTimestamp(String ip, long timestamp ){ - String[] splitIp = ip.split("\\."); - - //bho - String toConvertIp =""; - for (String ipPart: splitIp) - toConvertIp += UnicodeFormatter.byteToHex((byte)Integer.parseInt(ipPart)); - - - int t = (int) timestamp; - String tsString = UnicodeFormatter.byteToHex((byte)((t & 0xff000000) >> 24))+ - UnicodeFormatter.byteToHex((byte)((t & 0xff0000) >> 16))+ - UnicodeFormatter.byteToHex((byte)((t & 0xff00) >> 8))+ - UnicodeFormatter.byteToHex((byte)((t & 0xff))); - System.out.println("ts string is "+toConvertIp+tsString); - return toConvertIp+tsString; - } - - public static String toHexString(byte[] bytes) { - StringBuilder hexString = new StringBuilder(); - - for (int i = 0; i < bytes.length; i++) { - String hex = Integer.toHexString(0xFF & bytes[i]); - if (hex.length() == 1) { - hexString.append('0'); - } - hexString.append(hex); - } - - return hexString.toString(); - } - - - - public static class UnicodeFormatter { - - static public String byteToHex(byte b) { - // Returns hex String representation of byte b - char hexDigit[] = { - '0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' - }; - char[] array = { hexDigit[(b >> 4) & 0x0f], hexDigit[b & 0x0f] }; - return new String(array); - } - - static public String charToHex(char c) { - // Returns hex String representation of char c - byte hi = (byte) (c >>> 8); - byte lo = (byte) (c & 0xff); - return byteToHex(hi) + byteToHex(lo); - } - - } -} diff --git a/java/org/gcube/data/analysis/rconnector/TestCall.java b/java/org/gcube/data/analysis/rconnector/TestCall.java deleted file mode 100644 index de90a70..0000000 --- a/java/org/gcube/data/analysis/rconnector/TestCall.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.gcube.data.analysis.rconnector; - -import javax.ws.rs.core.Application; - -import org.glassfish.jersey.server.ResourceConfig; -import org.glassfish.jersey.test.JerseyTest; -import org.junit.Test; - -public class TestCall extends JerseyTest{ - - @Override - protected Application configure() { - return new ResourceConfig(Resource.class, DisconnectResource.class); - } - - @Test - public void disconnect() { - final String ret = target("disconnect").request().get(String.class); - System.out.println("return is "+ret); - } - -} diff --git a/pom.xml b/pom.xml deleted file mode 100644 index cc3b75e..0000000 --- a/pom.xml +++ /dev/null @@ -1,141 +0,0 @@ - - 4.0.0 - org.gcube.data.access - ckan-connector - 1.0.0-SNAPSHOT - war - ckan connector - a ckan connector for automatic login - - - distro - - - - - - org.gcube.distribution - maven-smartgears-bom - LATEST - pom - import - - - - - - - - org.python - jython-standalone - 2.5.2 - - - - eu.trentorise.opendata - jackan - 0.4.2 - - - - - org.gcube.core - common-smartgears - - - - - com.google.code.gson - gson - 2.3.1 - - - - - - javax.ws.rs - javax.ws.rs-api - 2.0 - - - org.glassfish.jersey.containers - jersey-container-servlet - 2.13 - - - - javax.servlet - javax.servlet-api - 3.0.1 - - - - org.slf4j - slf4j-api - - - - - com.google.guava - guava - 18.0 - - - - - org.projectlombok - lombok - 0.11.6 - - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-simple - 2.13 - test - - - - - ${artifactId} - - - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-war-plugin - 2.4 - - ckan-connector - false - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2 - - - ${distroDirectory}/descriptor.xml - - - - - servicearchive - install - - single - - - - - - - \ No newline at end of file diff --git a/resources/digest.py b/resources/digest.py deleted file mode 100644 index e2cf932..0000000 --- a/resources/digest.py +++ /dev/null @@ -1,35 +0,0 @@ -from hashlib import md5 - -def calculate_digest(ip, timestamp, secret, userid, tokens, user_data): - secret = maybe_encode(secret) - userid = maybe_encode(userid) - tokens = maybe_encode(tokens) - user_data = maybe_encode(user_data) - digest0 = md5(encode_ip_timestamp(ip, timestamp) + secret + userid + '\0' + tokens + '\0' + user_data).hexdigest() - digest = md5(maybe_encode(digest0) + secret).hexdigest() - return digest - - -if type(chr(1)) == type(''): #pragma NO COVER Python < 3.0 - def ints2bytes(ints): - return ''.join(map(chr, ints)) -else: #pragma NO COVER Python >= 3.0 - def ints2bytes(ints): - return bytes(ints) - -def encode_ip_timestamp(ip, timestamp): - ip_chars = ints2bytes(map(int, ip.split('.'))) - t = int(timestamp) - ts = ((t & 0xff000000) >> 24, - (t & 0xff0000) >> 16, - (t & 0xff00) >> 8, - t & 0xff) - ts_chars = ints2bytes(ts) - return ip_chars + ts_chars - - -def maybe_encode(s, encoding='utf8'): - if not isinstance(s, type('')): - s = s.encode(encoding) - return s - diff --git a/resources/logback.xml b/resources/logback.xml deleted file mode 100644 index 4f36cc8..0000000 --- a/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/org/gcube/data/access/ckanconnector/CKanConnector.java b/src/main/java/org/gcube/data/access/ckanconnector/CKanConnector.java deleted file mode 100644 index 54398c5..0000000 --- a/src/main/java/org/gcube/data/access/ckanconnector/CKanConnector.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.gcube.data.access.ckanconnector; - -import javax.ws.rs.ApplicationPath; - -import org.glassfish.jersey.server.ResourceConfig; - -@ApplicationPath("/gcube/service/") -public class CKanConnector extends ResourceConfig { - - public CKanConnector(){ - packages("org.gcube.data.access.ckanconnector"); - } - - -} diff --git a/src/main/java/org/gcube/data/access/ckanconnector/ConnectorManager.java b/src/main/java/org/gcube/data/access/ckanconnector/ConnectorManager.java deleted file mode 100644 index ccd12b8..0000000 --- a/src/main/java/org/gcube/data/access/ckanconnector/ConnectorManager.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.gcube.data.access.ckanconnector; - -import java.io.File; -import java.io.FileInputStream; -import java.net.URI; - -import javax.servlet.ServletContext; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.NewCookie; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - -import lombok.extern.slf4j.Slf4j; - -import org.gcube.common.authorization.library.provider.AuthorizationProvider; -import org.gcube.common.scope.api.ScopeProvider; -import org.python.core.PyLong; -import org.python.core.PyObject; -import org.python.core.PyString; -import org.python.util.PythonInterpreter; - -import eu.trentorise.opendata.jackan.CkanClient; -import eu.trentorise.opendata.jackan.model.CkanUser; - -@Path("connect/") -@Slf4j -public class ConnectorManager { - - @Context ServletContext context; - - RandomString randomString = new RandomString(12); - - @GET - public Response connect() { - try{ - if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getUserName() == null ) return Response.status(Status.UNAUTHORIZED).build(); - String ckanKey = context.getInitParameter("ckanKey"); - String changedUserName = AuthorizationProvider.instance.get().getUserName().replace(".", "_"); - int internalPort = Integer.parseInt(context.getInitParameter("internalPort")); - CkanClient ckanClient = new CkanClient("http://127.0.0.1:"+internalPort, ckanKey); - CkanUser user = null; - try{ - user = ckanClient.getUser(changedUserName); - }catch(Exception e){ - log.warn("user {} doesn't exist, the system will create it",AuthorizationProvider.instance.get().getUserName(), e); - } - if (user==null) - ckanClient.createUser(new CkanUser(changedUserName, AuthorizationProvider.instance.get().getUserName()+"@gcube.ckan.org" , randomString.nextString() )); - - log.info("logging {} in scope {}",AuthorizationProvider.instance.get().getUserName(), ScopeProvider.instance.get()); - return createResponse(changedUserName); - }catch(Exception e){ - log.info("error trying to connect to CKAN",e); - return Response.serverError().entity(e.getMessage()).build(); - } - } - - private Response createResponse(String userName){ - try{ - String secret = context.getInitParameter("secret"); - String hostIp = context.getInitParameter("hostIp"); - String hostname = context.getInitParameter("hostname"); - String fixedData = "userid_type:unicode"; - PythonInterpreter interpreter = new PythonInterpreter(); - interpreter.execfile(new FileInputStream(new File(this.getClass().getClassLoader().getResource("digest.py").getFile()))); - PyObject someFunc = interpreter.get("calculate_digest"); - long currentMillis = System.currentTimeMillis()/1000; - PyObject ret = someFunc.__call__(new PyObject[]{new PyString(hostIp), new PyLong(currentMillis), new PyString(secret), - new PyString(userName), new PyString(""), new PyString(fixedData)} ); - String realResult = (String) ret.__tojava__(String.class); - - String timestamp16 = Long.toString(currentMillis, 16); - - /*Calendar now = Calendar.getInstance(); - now.add(Calendar.YEAR, 10); - now.add(Calendar.DAY_OF_YEAR, -1); - SimpleDateFormat sdf = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.ENGLISH); - String format = sdf.format(now.getTime()); - */ - String cookieValue = realResult+timestamp16+userName+"!"+fixedData; - NewCookie cookie = new NewCookie("auth_tkt", - cookieValue, - "/", hostname, "", -1, false, true ); - - - NewCookie cookieHideHeader = new NewCookie("ckan_hide_header", "true", - "/", hostname, "", -1, false, true ); - - return Response.seeOther(new URI("https://"+hostname)) - .cookie(cookie).cookie(cookieHideHeader).build(); - }catch(Exception e){ - e.printStackTrace(); - return Response.serverError().build(); - } - } - -} diff --git a/src/main/java/org/gcube/data/access/ckanconnector/OrganizationManager.java b/src/main/java/org/gcube/data/access/ckanconnector/OrganizationManager.java deleted file mode 100644 index 1180553..0000000 --- a/src/main/java/org/gcube/data/access/ckanconnector/OrganizationManager.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.gcube.data.access.ckanconnector; - -import javax.servlet.ServletContext; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - -import lombok.extern.slf4j.Slf4j; - -import org.gcube.common.authorization.library.provider.AuthorizationProvider; -import org.gcube.common.scope.api.ScopeProvider; - -import com.google.gson.Gson; - -import eu.trentorise.opendata.jackan.CkanClient; -import eu.trentorise.opendata.jackan.exceptions.CkanNotFoundException; -import eu.trentorise.opendata.jackan.model.CkanOrganization; - - -@Path("") -@Slf4j -public class OrganizationManager { - - @Context ServletContext context; - - @PUT - @Path("/organization/{name}") - public Response create(@PathParam("name") String organizationName) { - log.info("create called"); - try{ - if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getUserName() == null ) return Response.status(Status.UNAUTHORIZED).build(); - - String ckanKey = context.getInitParameter("ckanKey"); - int internalPort = Integer.parseInt(context.getInitParameter("internalPort")); - CkanClient ckanClient = new CkanClient("http://127.0.0.1:"+internalPort, ckanKey); - - CkanOrganization org = new CkanOrganization(organizationName.replaceAll(" ", "_").replace(".", "_").toLowerCase()); - org.setDisplayName(organizationName); - org.setTitle(organizationName); - ckanClient.createOrganization(org); - - log.info("create organizzation {} called from user {} in scope {}",organizationName, AuthorizationProvider.instance.get().getUserName(), ScopeProvider.instance.get()); - return Response.ok().build(); - }catch(Exception e){ - log.error("error trying to create organization "+organizationName,e); - return Response.serverError().entity(e.getMessage()).build(); - } - } - - @GET - @Path("/organization/{name}") - @Produces(MediaType.APPLICATION_JSON) - public String get(@PathParam("name") String organizationName) { - log.info("get called with name {}", organizationName); - - if (AuthorizationProvider.instance.get()==null || AuthorizationProvider.instance.get().getUserName() == null ) throw new WebApplicationException("user authentication needed",Response.Status.UNAUTHORIZED); - - String ckanKey = context.getInitParameter("ckanKey"); - int internalPort = Integer.parseInt(context.getInitParameter("internalPort")); - - try{ - CkanClient ckanClient = new CkanClient("http://127.0.0.1:"+internalPort, ckanKey); - CkanOrganization org = ckanClient.getOrganization(organizationName.replaceAll(" ", "_").replace(".", "_").toLowerCase()); - log.trace("organization {} found",organizationName); - return new Gson().toJson(org); - }catch(CkanNotFoundException e){ - log.error("organization {} doesn't exist",organizationName); - throw new WebApplicationException("organization "+organizationName+" doesn't exist",Response.Status.NOT_FOUND); - } catch (Exception e) { - log.error("error trying to contect ckan",e); - throw new WebApplicationException("error trying to contect ckan",Response.Status.INTERNAL_SERVER_ERROR); - } - - - } - -} diff --git a/src/main/java/org/gcube/data/access/ckanconnector/RandomString.java b/src/main/java/org/gcube/data/access/ckanconnector/RandomString.java deleted file mode 100644 index 03c44b0..0000000 --- a/src/main/java/org/gcube/data/access/ckanconnector/RandomString.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.gcube.data.access.ckanconnector; - -import java.util.Random; - -public class RandomString { - - private static final char[] symbols; - - static { - StringBuilder tmp = new StringBuilder(); - for (char ch = '0'; ch <= '9'; ++ch) - tmp.append(ch); - for (char ch = 'a'; ch <= 'z'; ++ch) - tmp.append(ch); - symbols = tmp.toString().toCharArray(); - } - - private final Random random = new Random(); - - private final char[] buf; - - public RandomString(int length) { - if (length < 1) - throw new IllegalArgumentException("length < 1: " + length); - buf = new char[length]; - } - - public String nextString() { - for (int idx = 0; idx < buf.length; ++idx) - buf[idx] = symbols[random.nextInt(symbols.length)]; - return new String(buf); - } -} diff --git a/src/main/resources/digest.py b/src/main/resources/digest.py deleted file mode 100644 index e2cf932..0000000 --- a/src/main/resources/digest.py +++ /dev/null @@ -1,35 +0,0 @@ -from hashlib import md5 - -def calculate_digest(ip, timestamp, secret, userid, tokens, user_data): - secret = maybe_encode(secret) - userid = maybe_encode(userid) - tokens = maybe_encode(tokens) - user_data = maybe_encode(user_data) - digest0 = md5(encode_ip_timestamp(ip, timestamp) + secret + userid + '\0' + tokens + '\0' + user_data).hexdigest() - digest = md5(maybe_encode(digest0) + secret).hexdigest() - return digest - - -if type(chr(1)) == type(''): #pragma NO COVER Python < 3.0 - def ints2bytes(ints): - return ''.join(map(chr, ints)) -else: #pragma NO COVER Python >= 3.0 - def ints2bytes(ints): - return bytes(ints) - -def encode_ip_timestamp(ip, timestamp): - ip_chars = ints2bytes(map(int, ip.split('.'))) - t = int(timestamp) - ts = ((t & 0xff000000) >> 24, - (t & 0xff0000) >> 16, - (t & 0xff00) >> 8, - t & 0xff) - ts_chars = ints2bytes(ts) - return ip_chars + ts_chars - - -def maybe_encode(s, encoding='utf8'): - if not isinstance(s, type('')): - s = s.encode(encoding) - return s - diff --git a/src/main/resources/inactivesession.html b/src/main/resources/inactivesession.html deleted file mode 100644 index f714a83..0000000 --- a/src/main/resources/inactivesession.html +++ /dev/null @@ -1,4 +0,0 @@ - -

Rsutdio session inactive

-

log in using TabularData portlet from the i-marine portal

- \ No newline at end of file diff --git a/src/main/resources/logout.html b/src/main/resources/logout.html deleted file mode 100644 index c63c27d..0000000 --- a/src/main/resources/logout.html +++ /dev/null @@ -1,8 +0,0 @@ - - -

Successfully logged out from RStudio

-

this tab will close in 2 seconds

- - \ No newline at end of file diff --git a/src/main/resources/open.html b/src/main/resources/open.html deleted file mode 100644 index 8b0a1c8..0000000 --- a/src/main/resources/open.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - -

Opening

- - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/gcube-app.xml b/src/main/webapp/WEB-INF/gcube-app.xml deleted file mode 100644 index 6948378..0000000 --- a/src/main/webapp/WEB-INF/gcube-app.xml +++ /dev/null @@ -1,8 +0,0 @@ - - CkanConnector - DataAccess - 1.0.0-SNAPSHOT - ckan connector webapp - - - diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 49ebb87..0000000 --- a/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - secret - Ew2DCqvvavzBx7fKFPWwKhNKN - - - hostIp - 0.0.0.0 - - - hostname - ckan-d-d4s.d4science.org - - - internalPort - 8080 - - - ckanKey - 803ada7f-2080-493f-8a99-3e593e880d94 - - - org.gcube.data.access.ckanconnector.CkanConnector - - - org.gcube.data.access.ckanconnector.CkanConnector - /* - - \ No newline at end of file diff --git a/src/test/java/org/gcube/data/access/ckanconnector/TestCall.java b/src/test/java/org/gcube/data/access/ckanconnector/TestCall.java deleted file mode 100644 index e08a6ef..0000000 --- a/src/test/java/org/gcube/data/access/ckanconnector/TestCall.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.gcube.data.access.ckanconnector; - -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.net.URLConnection; -import java.util.Random; - -import javax.net.ssl.HttpsURLConnection; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Response; - -import org.gcube.common.authorization.client.Constants; -import org.gcube.common.scope.api.ScopeProvider; -import org.glassfish.jersey.server.ResourceConfig; -import org.glassfish.jersey.test.JerseyTest; -import org.junit.Test; - -public class TestCall extends JerseyTest{ - - @Override - protected Application configure() { - return new ResourceConfig(ConnectorManager.class); - } - - @Test - public void connect() { - final Response ret = target("connect").request().get(Response.class); - System.out.println("return is "+ret); - } - - @Test - public void createOrganization() throws Exception{ - String callUrl = "https://ckan-d-d4s.d4science.org/ckan-connector/organization/CreationTest?gcube-token=34c34146-ab38-42d5-9332-f325e8b2b930"; - URL url = new URL(callUrl); - HttpsURLConnection connection = (HttpsURLConnection)url.openConnection(); - connection.setRequestMethod("PUT"); - - System.out.println(connection.getResponseCode()); - } - - - -} diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml deleted file mode 100644 index 4f36cc8..0000000 --- a/src/test/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n - - - - - - - - - - - \ No newline at end of file