From a8bae916f3998b390561d431e4de23326bc89d13 Mon Sep 17 00:00:00 2001
From: Nate Jensen <Nathan.Jensen@raytheon.com>
Date: Tue, 17 Jun 2014 07:40:18 -0500
Subject: [PATCH] Omaha #3255 fix build

Change-Id: I0bff28eb7d430c7a789539a76c893ecf0a64ac46

Former-commit-id: 579cef6ab063bae1df0cfe85411d174dc75b08bd
---
 .../res/spring/ebxml-webservices.xml                          | 2 +-
 .../edex/registry/ebxml}/services/RegistryRESTServices.java   | 4 +++-
 .../ebxml/services/lifecycle/ObjectReferenceResolver.java     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename edexOsgi/{com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry => com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml}/services/RegistryRESTServices.java (97%)

diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml
index 39ec5836c9..954db66e28 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-webservices.xml
@@ -4,7 +4,7 @@
 	http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<bean id="registryRestClient"
-		class="com.raytheon.uf.common.registry.services.RegistryRESTServices">
+		class="com.raytheon.uf.edex.registry.ebxml.services.RegistryRESTServices">
 		<property name="serviceConfig" ref="RegistryServiceConfig" />
 		<property name="securityConfig" ref="securityConfiguration" />
 	</bean>
diff --git a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/RegistryRESTServices.java
similarity index 97%
rename from edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
rename to edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/RegistryRESTServices.java
index 9a5e3f9839..7535c8b37b 100644
--- a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/RegistryRESTServices.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.registry.services;
+package com.raytheon.uf.edex.registry.ebxml.services;
 
 import java.lang.reflect.Proxy;
 import java.net.URL;
@@ -38,6 +38,8 @@ import com.google.common.io.Resources;
 import com.raytheon.uf.common.registry.RegistryJaxbManager;
 import com.raytheon.uf.common.registry.RegistryNamespaceMapper;
 import com.raytheon.uf.common.registry.ebxml.RegistryUtil;
+import com.raytheon.uf.common.registry.services.RegistryServiceConfiguration;
+import com.raytheon.uf.common.registry.services.RegistryServiceException;
 import com.raytheon.uf.common.registry.services.rest.IRegistryObjectsRestService;
 import com.raytheon.uf.common.registry.services.rest.IRepositoryItemsRestService;
 import com.raytheon.uf.edex.security.SecurityConfiguration;
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/ObjectReferenceResolver.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/ObjectReferenceResolver.java
index 10b7ab92d4..8d6d76ae9c 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/ObjectReferenceResolver.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/ObjectReferenceResolver.java
@@ -43,12 +43,12 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.raytheon.uf.common.registry.schemas.ebxml.util.annotations.RegistryObjectReference;
-import com.raytheon.uf.common.registry.services.RegistryRESTServices;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.edex.registry.ebxml.dao.DynamicObjectRefDao;
 import com.raytheon.uf.edex.registry.ebxml.dao.RegistryObjectDao;
 import com.raytheon.uf.edex.registry.ebxml.exception.EbxmlRegistryException;
+import com.raytheon.uf.edex.registry.ebxml.services.RegistryRESTServices;
 import com.raytheon.uf.edex.registry.ebxml.util.EbxmlExceptionUtil;
 
 /**