From 2732b125c5b25a777b7b777589833ea3aae4cda6 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Tue, 23 Jul 2019 17:57:47 +0200 Subject: [PATCH] moved classes in their original packages --- .../soap/AbstractEndpointReferenceBuilder.java | 0 .../DataStructureLookupEndpointReferenceBuilder.java | 4 +--- ...DataStructureProfileEndpointReferenceBuilder.java | 4 +--- .../soap/EndpointReferenceBuilder.java | 0 .../soap/StaticEndpointReferenceBuilder.java | 0 .../soap/cxf/CxfEndpointReferenceBuilder.java | 0 .../soap/cxf/JaxwsEndpointReferenceBuilder.java | 0 .../cxf/StandaloneCxfEndpointReferenceBuilder.java | 0 .../soap/applicationContext-common-eprbuilders.xml | 12 ++++++------ 9 files changed, 8 insertions(+), 12 deletions(-) rename dnet-core-components/src/main/java/eu/dnetlib/{enabling => }/soap/AbstractEndpointReferenceBuilder.java (100%) rename dnet-core-components/src/main/java/eu/dnetlib/{enabling => }/soap/DataStructureLookupEndpointReferenceBuilder.java (94%) rename dnet-core-components/src/main/java/eu/dnetlib/{enabling => }/soap/DataStructureProfileEndpointReferenceBuilder.java (94%) rename dnet-core-components/src/main/java/eu/dnetlib/{enabling => }/soap/EndpointReferenceBuilder.java (100%) rename dnet-core-components/src/main/java/eu/dnetlib/{enabling => }/soap/StaticEndpointReferenceBuilder.java (100%) rename dnet-core-components/src/main/java/eu/dnetlib/{enabling => }/soap/cxf/CxfEndpointReferenceBuilder.java (100%) rename dnet-core-components/src/main/java/eu/dnetlib/{enabling => }/soap/cxf/JaxwsEndpointReferenceBuilder.java (100%) rename dnet-core-components/src/main/java/eu/dnetlib/{enabling => }/soap/cxf/StandaloneCxfEndpointReferenceBuilder.java (100%) diff --git a/dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/AbstractEndpointReferenceBuilder.java b/dnet-core-components/src/main/java/eu/dnetlib/soap/AbstractEndpointReferenceBuilder.java similarity index 100% rename from dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/AbstractEndpointReferenceBuilder.java rename to dnet-core-components/src/main/java/eu/dnetlib/soap/AbstractEndpointReferenceBuilder.java diff --git a/dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/DataStructureLookupEndpointReferenceBuilder.java b/dnet-core-components/src/main/java/eu/dnetlib/soap/DataStructureLookupEndpointReferenceBuilder.java similarity index 94% rename from dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/DataStructureLookupEndpointReferenceBuilder.java rename to dnet-core-components/src/main/java/eu/dnetlib/soap/DataStructureLookupEndpointReferenceBuilder.java index d88918d..ed26125 100644 --- a/dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/DataStructureLookupEndpointReferenceBuilder.java +++ b/dnet-core-components/src/main/java/eu/dnetlib/soap/DataStructureLookupEndpointReferenceBuilder.java @@ -1,4 +1,4 @@ -package eu.dnetlib.enabling.soap; +package eu.dnetlib.soap; import java.util.Map; @@ -11,8 +11,6 @@ import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService; import eu.dnetlib.enabling.locators.UniqueServiceLocator; import eu.dnetlib.enabling.tools.OpaqueResource; import eu.dnetlib.enabling.tools.StringOpaqueResource; -import eu.dnetlib.soap.AbstractEndpointReferenceBuilder; -import eu.dnetlib.soap.EndpointReferenceBuilder; /** * Builds an epr given an ID to a datastructure. diff --git a/dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/DataStructureProfileEndpointReferenceBuilder.java b/dnet-core-components/src/main/java/eu/dnetlib/soap/DataStructureProfileEndpointReferenceBuilder.java similarity index 94% rename from dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/DataStructureProfileEndpointReferenceBuilder.java rename to dnet-core-components/src/main/java/eu/dnetlib/soap/DataStructureProfileEndpointReferenceBuilder.java index 885acc1..39b977e 100644 --- a/dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/DataStructureProfileEndpointReferenceBuilder.java +++ b/dnet-core-components/src/main/java/eu/dnetlib/soap/DataStructureProfileEndpointReferenceBuilder.java @@ -1,4 +1,4 @@ -package eu.dnetlib.enabling.soap; +package eu.dnetlib.soap; import java.util.HashMap; import java.util.Map; @@ -10,8 +10,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import eu.dnetlib.enabling.tools.OpaqueResource; -import eu.dnetlib.soap.AbstractEndpointReferenceBuilder; -import eu.dnetlib.soap.EndpointReferenceBuilder; import eu.dnetlib.soap.cxf.CxfEndpointReferenceBuilder; /** diff --git a/dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/EndpointReferenceBuilder.java b/dnet-core-components/src/main/java/eu/dnetlib/soap/EndpointReferenceBuilder.java similarity index 100% rename from dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/EndpointReferenceBuilder.java rename to dnet-core-components/src/main/java/eu/dnetlib/soap/EndpointReferenceBuilder.java diff --git a/dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/StaticEndpointReferenceBuilder.java b/dnet-core-components/src/main/java/eu/dnetlib/soap/StaticEndpointReferenceBuilder.java similarity index 100% rename from dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/StaticEndpointReferenceBuilder.java rename to dnet-core-components/src/main/java/eu/dnetlib/soap/StaticEndpointReferenceBuilder.java diff --git a/dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/cxf/CxfEndpointReferenceBuilder.java b/dnet-core-components/src/main/java/eu/dnetlib/soap/cxf/CxfEndpointReferenceBuilder.java similarity index 100% rename from dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/cxf/CxfEndpointReferenceBuilder.java rename to dnet-core-components/src/main/java/eu/dnetlib/soap/cxf/CxfEndpointReferenceBuilder.java diff --git a/dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/cxf/JaxwsEndpointReferenceBuilder.java b/dnet-core-components/src/main/java/eu/dnetlib/soap/cxf/JaxwsEndpointReferenceBuilder.java similarity index 100% rename from dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/cxf/JaxwsEndpointReferenceBuilder.java rename to dnet-core-components/src/main/java/eu/dnetlib/soap/cxf/JaxwsEndpointReferenceBuilder.java diff --git a/dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/cxf/StandaloneCxfEndpointReferenceBuilder.java b/dnet-core-components/src/main/java/eu/dnetlib/soap/cxf/StandaloneCxfEndpointReferenceBuilder.java similarity index 100% rename from dnet-core-components/src/main/java/eu/dnetlib/enabling/soap/cxf/StandaloneCxfEndpointReferenceBuilder.java rename to dnet-core-components/src/main/java/eu/dnetlib/soap/cxf/StandaloneCxfEndpointReferenceBuilder.java diff --git a/dnet-core-components/src/main/resources/eu/dnetlib/enabling/soap/applicationContext-common-eprbuilders.xml b/dnet-core-components/src/main/resources/eu/dnetlib/enabling/soap/applicationContext-common-eprbuilders.xml index 0ab63d1..353b65e 100644 --- a/dnet-core-components/src/main/resources/eu/dnetlib/enabling/soap/applicationContext-common-eprbuilders.xml +++ b/dnet-core-components/src/main/resources/eu/dnetlib/enabling/soap/applicationContext-common-eprbuilders.xml @@ -3,16 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:lang="http://www.springframework.org/schema/lang" xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd - http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd + http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> + class="eu.dnetlib.soap.DataStructureProfileEndpointReferenceBuilder" /> + class="eu.dnetlib.soap.DataStructureLookupEndpointReferenceBuilder" + p:dsEprBuilder-ref="dsProfileEprBuilder" p:serviceLocator-ref="uniqueServiceLocator" />