Changed classes signature

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@133111 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/informationsystem/resourceregistry/ResourceInitializer.java

@@ -4,6 +4,9 @@ import javax.ws.rs.ApplicationPath;
 
 import org.glassfish.jersey.server.ResourceConfig;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 @ApplicationPath("/")
 public class ResourceInitializer extends ResourceConfig  {
 

src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseEnvironment.java

@@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory;
 
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  *
  */
 public class DatabaseEnvironment {

src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/DatabaseIntializator.java

@@ -25,7 +25,7 @@ import com.tinkerpop.blueprints.impls.orient.OrientGraphNoTx;
 import com.tinkerpop.blueprints.impls.orient.OrientVertexType;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  *
  */
 public class DatabaseIntializator {

src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SchemaInitializator.java

@@ -27,7 +27,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * 
  */
 @SuppressWarnings("rawtypes")

src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SecurityContext.java

@@ -21,7 +21,7 @@ import com.tinkerpop.blueprints.impls.orient.OrientGraph;
 import com.tinkerpop.blueprints.impls.orient.OrientVertex;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * 
  */
 public class SecurityContext {

src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/SecurityContextMapper.java

@@ -13,7 +13,7 @@ import com.tinkerpop.blueprints.impls.orient.OrientGraph;
 import com.tinkerpop.blueprints.impls.orient.OrientGraphFactory;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * 
  */
 public abstract class SecurityContextMapper {

src/main/java/org/gcube/informationsystem/resourceregistry/dbinitialization/Tree.java

@@ -10,7 +10,7 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  */
 class Tree<T> {
 

src/main/java/org/gcube/informationsystem/resourceregistry/resources/Access.java

@@ -21,7 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * @author Lucio Lelii (lucio.lelii@isti.cnr.it)
  */
 @Path(AccessPath.ACCESS_PATH_PART)

src/main/java/org/gcube/informationsystem/resourceregistry/resources/ContextManager.java

@@ -21,7 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * @author Lucio Lelii (lucio.lelii@isti.cnr.it)
  */
 @Path(ContextPath.CONTEXT_PATH_PART)

src/main/java/org/gcube/informationsystem/resourceregistry/resources/EntityManager.java

@@ -20,7 +20,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * @author Lucio Lelii (lucio.lelii@isti.cnr.it)
  */
 @Path(EntityPath.ENTITY_PATH_PART)

src/main/java/org/gcube/informationsystem/resourceregistry/resources/ResourceRegistryExceptionMapper.java

@@ -10,6 +10,9 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.NotAllowedExc
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ObjectNotFound;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 @Provider
 public class ResourceRegistryExceptionMapper implements ExceptionMapper<ResourceRegistryException>{
 

src/main/java/org/gcube/informationsystem/resourceregistry/resources/SchemaManager.java

@@ -13,7 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * @author Lucio Lelii (lucio.lelii@isti.cnr.it)
  */
 @ApplicationPath(SchemaPath.SCHEMA_PATH_PART)

src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/ContextManagementImpl.java

@@ -32,7 +32,7 @@ import com.tinkerpop.frames.FramedGraph;
 import com.tinkerpop.frames.FramedGraphFactory;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  */
 public class ContextManagementImpl implements ContextManagement {
 

src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/EntityManagementImpl.java

@@ -4,7 +4,6 @@
 package org.gcube.informationsystem.resourceregistry.resources.impl;
 
 import java.io.IOException;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -17,8 +16,6 @@ import java.util.Set;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
-import org.codehaus.jettison.json.JSONStringer;
-import org.codehaus.jettison.json.JSONWriter;
 import org.gcube.informationsystem.impl.utils.Entities;
 import org.gcube.informationsystem.model.embedded.Embedded;
 import org.gcube.informationsystem.model.embedded.Header;
@@ -54,7 +51,7 @@ import com.tinkerpop.blueprints.impls.orient.OrientGraph;
 import com.tinkerpop.blueprints.impls.orient.OrientVertex;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * 
  */
 public class EntityManagementImpl implements EntityManagement {

src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/QueryImpl.java

@@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory;
 import com.sun.research.ws.wadl.HTTPMethods;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * 
  */
 public class QueryImpl implements Query {

src/main/java/org/gcube/informationsystem/resourceregistry/resources/impl/SchemaManagementImpl.java

@@ -39,7 +39,7 @@ import com.tinkerpop.blueprints.impls.orient.OrientVertexType;
 import com.tinkerpop.blueprints.impls.orient.OrientVertexType.OrientVertexProperty;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * 
  *         TODO Create an instance for each Registered Type in a management
  *         SecurityContext so that that management context can be used to see

src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/ContextUtility.java

@@ -27,7 +27,7 @@ import com.tinkerpop.blueprints.impls.orient.OrientGraph;
 import com.tinkerpop.blueprints.impls.orient.OrientGraphFactory;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * 
  */
 public class ContextUtility {

src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/HeaderUtility.java

@@ -21,7 +21,7 @@ import com.tinkerpop.blueprints.Edge;
 import com.tinkerpop.blueprints.Vertex;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * 
  */
 public class HeaderUtility {

src/main/java/org/gcube/informationsystem/resourceregistry/resources/utils/Utility.java

@@ -29,7 +29,7 @@ import com.tinkerpop.blueprints.util.io.graphson.GraphSONMode;
 import com.tinkerpop.blueprints.util.io.graphson.GraphSONUtility;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * 
  */
 public class Utility {

src/test/java/org/gcube/informationsystem/resourceregistry/dbinitialization/ContextCreation.java

@@ -13,7 +13,7 @@ import org.gcube.informationsystem.model.relation.isrelatedto.BelongsTo;
 import org.junit.Test;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  *
  */
 public class ContextCreation {

src/test/java/org/gcube/informationsystem/resourceregistry/resources/impl/ContextManagementImplTest.java

@@ -17,7 +17,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * 
  */
 public class ContextManagementImplTest {

src/test/java/org/gcube/informationsystem/resourceregistry/resources/impl/EntityManagementImplTest.java

@@ -39,7 +39,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  * 
  */
 public class EntityManagementImplTest {
@@ -383,7 +383,7 @@ public class EntityManagementImplTest {
 				HostingNode.class.getSimpleName(), resourceStringWriter.toString());
 		String resourceUUID = Utility.getUUIDFromJSONString(json);
 
-		
+		logger.debug(resourceUUID);
 
 		//entityManagementImpl.deleteResource(resourceUUID);
 		

src/test/java/org/gcube/informationsystem/resourceregistry/resources/impl/QueryImplTest.java

@@ -10,7 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  *
  */
 public class QueryImplTest {

src/test/java/org/gcube/informationsystem/resourceregistry/resources/impl/SchemaManagementImplTest.java

@@ -6,9 +6,6 @@ package org.gcube.informationsystem.resourceregistry.resources.impl;
 import org.gcube.informationsystem.model.embedded.AccessPolicy;
 import org.gcube.informationsystem.model.entity.facet.ContactFacet;
 import org.gcube.informationsystem.model.entity.resource.Actor;
-import org.gcube.informationsystem.model.relation.ConsistsOf;
-import org.gcube.informationsystem.model.relation.IsRelatedTo;
-import org.gcube.informationsystem.model.relation.consistsof.HasContact;
 import org.gcube.informationsystem.model.relation.isrelatedto.Hosts;
 import org.gcube.informationsystem.types.TypeBinder;
 import org.junit.Test;
@@ -16,7 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ * @author Luca Frosini (ISTI - CNR)
  */
 public class SchemaManagementImplTest {
 

src/test/resources/config.properties.dev

@@ -0,0 +1,12 @@
+HOST=orientdb01-d-d4s.d4science.org,orientdb02-d-d4s.d4science.org,orientdb02-d-d4s.d4science.org
+REMOTE_PROTOCOL=remote:
+HTTP_PROTOCOL=https://
+HTTP_PORT=:443
+DB=dbname
+USERNAME=root
+PASSWORD=ktf5e9uRyZNw2rjIUk
+DEFAULT_CREATED_WRITER_USER_PASSWORD=ENYQYtjdzyAXZxj3XDZlE15vTn3bNYEa5xCDOe
+DEFAULT_CREATED_READER_USER_PASSWORD=tR47hRSvwTOACi6B9jFLLIR9tdfLPYdaQ1Q7V8
+DEFAULT_ADMIN_USERNAME=admin
+DEFAULT_ADMIN_PASSWORD=admin
+CHANGED_ADMIN_PASSWORD=tR47hRSvwTOACi6B9jFLLIR9tdfLPYdaQ1Q7V8

src/test/resources/config.properties.test

@@ -0,0 +1,20 @@
+#HOST=orientdb01-d-d4s.d4science.org
+HOST=pc-frosini.isti.cnr.it
+REMOTE_PROTOCOL= remote:
+
+HTTP_PROTOCOL=http://
+HTTP_PORT=:2480
+DB=IS
+
+# OrientDB root access. Needed to be able to create new databases 
+USERNAME=root
+PASSWORD=silviomerda
+
+DEFAULT_CREATED_WRITER_USER_PASSWORD=Aingohd0
+DEFAULT_CREATED_READER_USER_PASSWORD=Qua4AiFo
+
+DEFAULT_ADMIN_USERNAME=admin
+DEFAULT_ADMIN_PASSWORD=admin
+CHANGED_ADMIN_PASSWORD=we3Aeyai
+
+DISTRIBUTED_MODE=true