From 4aa52a79592d54605ebb1b86fa203f5f07b286f7 Mon Sep 17 00:00:00 2001
From: j00302280 <j00101220@huawei.com>
Date: Mon, 26 Sep 2016 12:56:23 +0800
Subject: Solve the install issues

Change-Id: I4402388c3d245a062299fd6d65fa152d63b8f08c
Signed-off-by: j00302280 <j00101220@huawei.com>
---
 .../roa/impl/ServiceGatewayRoaModuleImpl.java               | 11 +++++++++++
 .../service/src/main/resources/spring/service.xml           | 13 ++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'servicegateway/service/src/main')

diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImpl.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImpl.java
index ff337512..3c47c657 100644
--- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImpl.java
+++ b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImpl.java
@@ -124,4 +124,15 @@ public class ServiceGatewayRoaModuleImpl implements IServiceGatewayRoaModule {
 
         return Response.accepted().entity(result).build();
     }
+
+	public IServiceGateway getServiceGateway() 
+	{
+		return serviceGateway;
+	}
+
+	public void setServiceGateway(IServiceGateway serviceGateway) 
+	{
+		this.serviceGateway = serviceGateway;
+	}
+    
 }
diff --git a/servicegateway/service/src/main/resources/spring/service.xml b/servicegateway/service/src/main/resources/spring/service.xml
index c328d867..39e5ea7f 100644
--- a/servicegateway/service/src/main/resources/spring/service.xml
+++ b/servicegateway/service/src/main/resources/spring/service.xml
@@ -26,7 +26,6 @@
     http://www.huawei.com/schema/oms/oms.xsd
     http://cxf.apache.org/jaxrs 
     http://cxf.apache.org/schemas/jaxrs.xsd">
-
     <!-- these are included in the dependency jar -->
     <import resource="classpath:META-INF/cxf/cxf.xml" />
     <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
@@ -35,8 +34,7 @@
     <jaxrs:server id="sampleServer" address="/">    
         <!-- registering beans -->
         <jaxrs:serviceBeans>
-            <ref bean="ServicemgrRoaModuleImpl"></ref>
-            <ref bean="ServicePackageModuleImpl"></ref>
+            <ref bean="serviceGatewayRoaModuleImpl"></ref>            
         </jaxrs:serviceBeans>
         <!-- registering providers -->
         <jaxrs:providers>
@@ -65,9 +63,10 @@
     <bean id="Activator" class="org.openo.gso.gui.servicegateway.activator.Activator" init-method="start" destroy-method="stop">
     </bean>
     
-    <bean id="ServicGatewayRoaModuleImpl" class="org.openo.gso.gui.servicegateway.roa.impl.ServicGatewayRoaModuleImpl">
-        <property name="ServiceGateway" ref="ServiceGateway"></property>
+    <bean id="serviceGatewayRoaModuleImpl" class="org.openo.gso.gui.servicegateway.roa.impl.ServiceGatewayRoaModuleImpl">
+        <property name="serviceGateway" ref="serviceGateway"></property>
     </bean>    
-    
-    </bean>
+	
+	<bean id="serviceGateway" class="org.openo.gso.gui.servicegateway.service.impl.ServiceGatewayImpl">        
+    </bean>  
 </beans>
\ No newline at end of file
-- 
cgit