From cffdb3230a2f5f8a82f5ebba41866a3fadb866de Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Fri, 7 Aug 2009 21:13:09 +0000 Subject: [PATCH] NOJIRA: Changing the Java packaging for the Relation service artifacts. --- .../services/{ => common}/relation/RelationJAXBSchema.java | 2 +- .../{ => common}/relation/RelationListItemJAXBSchema.java | 2 +- .../services/nuxeo/relation/RelationUtilsNuxeoImpl.java | 4 ++-- .../services/client/test/RelationServiceTest.java | 2 +- .../collectionspace/services/relation/RelationResource.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) rename services/common/src/main/java/org/collectionspace/services/{ => common}/relation/RelationJAXBSchema.java (94%) rename services/common/src/main/java/org/collectionspace/services/{ => common}/relation/RelationListItemJAXBSchema.java (91%) diff --git a/services/common/src/main/java/org/collectionspace/services/relation/RelationJAXBSchema.java b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java similarity index 94% rename from services/common/src/main/java/org/collectionspace/services/relation/RelationJAXBSchema.java rename to services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java index 4c338e805..2d3d7ed8d 100644 --- a/services/common/src/main/java/org/collectionspace/services/relation/RelationJAXBSchema.java +++ b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java @@ -24,7 +24,7 @@ * You may obtain a copy of the ECL 2.0 License at * https://source.collectionspace.org/collection-space/LICENSE.txt */ -package org.collectionspace.services.relation; +package org.collectionspace.services.common.relation; /** * The Interface RelationJAXBSchema. diff --git a/services/common/src/main/java/org/collectionspace/services/relation/RelationListItemJAXBSchema.java b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationListItemJAXBSchema.java similarity index 91% rename from services/common/src/main/java/org/collectionspace/services/relation/RelationListItemJAXBSchema.java rename to services/common/src/main/java/org/collectionspace/services/common/relation/RelationListItemJAXBSchema.java index 96d70a2c7..d84307a98 100644 --- a/services/common/src/main/java/org/collectionspace/services/relation/RelationListItemJAXBSchema.java +++ b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationListItemJAXBSchema.java @@ -24,7 +24,7 @@ * You may obtain a copy of the ECL 2.0 License at * https://source.collectionspace.org/collection-space/LICENSE.txt */ -package org.collectionspace.services.relation; +package org.collectionspace.services.common.relation; /** * The Interface RelationListItemJAXBSchema. diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/relation/RelationUtilsNuxeoImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/relation/RelationUtilsNuxeoImpl.java index ca4ac692e..a85712bd9 100644 --- a/services/common/src/main/java/org/collectionspace/services/nuxeo/relation/RelationUtilsNuxeoImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/relation/RelationUtilsNuxeoImpl.java @@ -32,8 +32,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.collectionspace.services.relation.RelationJAXBSchema; -import org.collectionspace.services.relation.RelationListItemJAXBSchema; +import org.collectionspace.services.common.relation.RelationJAXBSchema; +import org.collectionspace.services.common.relation.RelationListItemJAXBSchema; import org.collectionspace.services.common.relation.RelationUtils; import org.collectionspace.services.relation.Relation; diff --git a/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java b/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java index 5a6cc048d..d6b3494b2 100644 --- a/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java +++ b/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java @@ -15,7 +15,7 @@ import org.collectionspace.services.relation.RelationList; import org.collectionspace.services.relation.RelationshipType; import org.collectionspace.services.client.RelationClient; -import org.collectionspace.services.relation.RelationJAXBSchema; +import org.collectionspace.services.common.relation.RelationJAXBSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java index ba432921c..460653144 100644 --- a/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java +++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java @@ -50,8 +50,8 @@ import org.collectionspace.services.relation.RelationService; import org.collectionspace.services.relation.*; import org.collectionspace.services.relation.RelationList.*; -import org.collectionspace.services.relation.RelationJAXBSchema; -import org.collectionspace.services.relation.RelationListItemJAXBSchema; +import org.collectionspace.services.common.relation.RelationJAXBSchema; +import org.collectionspace.services.common.relation.RelationListItemJAXBSchema; import org.collectionspace.services.common.ServiceMain; import org.collectionspace.services.common.repository.DocumentException; -- 2.47.3