diff options
Diffstat (limited to 'servicegateway/service')
3 files changed, 58 insertions, 140 deletions
diff --git a/servicegateway/service/pom.xml b/servicegateway/service/pom.xml index 3ff6fdcf..b0cd551e 100644 --- a/servicegateway/service/pom.xml +++ b/servicegateway/service/pom.xml @@ -17,155 +17,63 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> + <parent> <groupId>org.openo.gso.gui</groupId> - <artifactId>servicegateway</artifactId> + <artifactId>service-gateway-root</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <artifactId>service</artifactId> - <name>service</name> + <artifactId>service-gateway-service</artifactId> + <name>ServiceGatewayService</name> <packaging>war</packaging> - - <dependencies> - <dependency> - <groupId>org.openo.common-services.common-utilities</groupId> - <artifactId>commonlib-cbb</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - <!-- roa --> - <dependency> - <groupId>org.openo.common-services.common-utilities</groupId> - <artifactId>commonlib-restclient</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>3.1.6</version> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - </dependency> - - <dependency> - <groupId>org.openo.gso</groupId> - <artifactId>org.openo.gso.commsvc.common</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>3.1.0.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>3.1.0.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <version>3.1.0.RELEASE</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>3.1.0.RELEASE</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>4.1.0</version> - </dependency> - <dependency> - <groupId>org.mybatis</groupId> - <artifactId>mybatis</artifactId> - <version>3.2.7</version> - </dependency> - <dependency> - <groupId>org.mybatis</groupId> - <artifactId>mybatis-spring</artifactId> - <version>1.2.0</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.mchange</groupId> - <artifactId>c3p0</artifactId> - <version>0.9.2.1</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> - <version>1.9.2</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> - </dependency> - <dependency> - <groupId>com.googlecode.jmockit</groupId> - <artifactId>jmockit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jmockit</groupId> - <artifactId>jmockit-coverage</artifactId> - <version>1.18</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.4.190</version> - <scope>test</scope> - </dependency> - </dependencies> - + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <cxf.version>3.1.6</cxf.version> + <slf4j.version>1.6.1</slf4j.version> + <maven.test.skip>false</maven.test.skip> + <maven.test.failure.ignore>false</maven.test.failure.ignore> + </properties> + + <profiles> + <profile> + <id>all-tests</id> + <properties> + <build.profile.id>all-tests</build.profile.id> + <skip.unit.tests>false</skip.unit.tests> + </properties> + </profile> + </profiles> <build> + <finalName>ROOT</finalName> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + <!-- Used for unit tests --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> <configuration> - <argLine>-XX:-UseSplitVerifier</argLine> - <skipTests>true</skipTests> + <forkMode>always</forkMode> + <argLine>${surefireArgLine}</argLine> + <skip>${maven.test.skip}</skip> + <!-- + <testFailureIgnore>${maven.test.failure.ignore}</testFailureIgnore> + --> <testFailureIgnore>true</testFailureIgnore> + <!-- Excludes integration tests when unit tests are run. --> <excludes> - <exclude>${excludesFile}</exclude> + <exclude>**/IT*.java</exclude> </excludes> </configuration> </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.7</version> - <configuration> - <formats> - <format>html</format> - <format>xml</format> - </formats> - <instrumentation> - <excludes> - <exclude>org/**/*Test.class</exclude> - </excludes> - </instrumentation> - </configuration> - </plugin> </plugins> </build> </project> 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 |