Author: ffang
Date: Wed Aug 18 06:50:46 2010
New Revision: 986579
URL: http://svn.apache.org/viewvc?rev=986579&view=rev
Log:
[SMX4-579]extract common used classes for itests
Added:
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf-http-osgi/
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf-http-osgi/HelloWorldImpl.java
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/java/org/apache/servicemix/examples/cxf-jms-osgi/
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/java/org/apache/servicemix/examples/cxf-jms-osgi/HelloWorldImpl.java
servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/java/org/apache/servicemix/examples/cxf_nmr_osgi/
servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/java/org/apache/servicemix/examples/cxf_nmr_osgi/HelloWorldImpl.java
servicemix/smx4/features/trunk/examples/itests/test-commons/
servicemix/smx4/features/trunk/examples/itests/test-commons/pom.xml
servicemix/smx4/features/trunk/examples/itests/test-commons/src/
servicemix/smx4/features/trunk/examples/itests/test-commons/src/main/
servicemix/smx4/features/trunk/examples/itests/test-commons/src/main/resources/
servicemix/smx4/features/trunk/examples/itests/test-commons/src/main/resources/wsdl/
servicemix/smx4/features/trunk/examples/itests/test-commons/src/main/resources/wsdl/hello_world.wsdl
Removed:
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/java/org/apache/servicemix/examples/cxf/HelloWorldImpl.java
Modified:
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml
servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml
servicemix/smx4/features/trunk/examples/itests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml?rev=986579&r1=986578&r2=986579&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml
(original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/pom.xml Wed
Aug 18 06:50:46 2010
@@ -39,39 +39,24 @@
<version>${cxf.version}</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
<version>${geronimo.wsmetadata.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.examples</groupId>
+
<artifactId>org.apache.servicemix.examples.itests.test-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf.version}</version>
- <executions>
- <execution>
- <id>generate-test-sources</id>
- <phase>generate-sources</phase>
- <configuration>
-
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
- <wsdlOptions>
- <wsdlOption>
-
<wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
- </wsdlOption>
- </wsdlOptions>
- </configuration>
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
@@ -92,10 +77,10 @@
org.apache.cxf.configuration.spring,
org.apache.cxf.resource,
org.apache.cxf.transport.http_osgi,
- org.springframework.beans.factory.config
+ org.springframework.beans.factory.config,
+ org.apache.servicemix.examples.cxf
</Import-Package>
-
<!--<Private-Package>org.apache.servicemix.examples.cxf</Private-Package>-->
-
<Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
+
<Export-Package>org.apache.servicemix.examples.cxf_http_osgi</Export-Package>
<Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
</instructions>
</configuration>
Added:
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf-http-osgi/HelloWorldImpl.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf-http-osgi/HelloWorldImpl.java?rev=986579&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf-http-osgi/HelloWorldImpl.java
(added)
+++
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/java/org/apache/servicemix/examples/cxf-http-osgi/HelloWorldImpl.java
Wed Aug 18 06:50:46 2010
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// START SNIPPET: service
+package org.apache.servicemix.examples.cxf_http_osgi;
+
+import javax.jws.WebService;
+import org.apache.servicemix.examples.cxf.*;
+//@WebService(endpointInterface =
"org.apache.servicemix.examples.cxf.HelloWorld")
+...@webservice(serviceName = "HelloWorldImplService",
+ portName = "HelloWorldImplPort",
+ endpointInterface =
"org.apache.servicemix.examples.cxf.HelloWorld",
+ targetNamespace = "http://cxf.examples.servicemix.apache.org/";)
+public class HelloWorldImpl implements HelloWorld {
+
+ public String sayHi(String text) {
+ return "Hello " + text;
+ }
+}
+// END SNIPPET: service
Modified:
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml?rev=986579&r1=986578&r2=986579&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml
(original)
+++
servicemix/smx4/features/trunk/examples/itests/cxf-http-osgi/src/main/resources/META-INF/spring/beans.xml
Wed Aug 18 06:50:46 2010
@@ -33,7 +33,7 @@
<import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
<jaxws:endpoint id="HTTPEndpoint"
- implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
+
implementor="org.apache.servicemix.examples.cxf_http_osgi.HelloWorldImpl"
address="/HelloWorldOSGi"
wsdlLocation="wsdl/hello_world.wsdl"
endpointName="e:HelloWorldImplPort"
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml?rev=986579&r1=986578&r2=986579&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml
(original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/pom.xml Wed Aug
18 06:50:46 2010
@@ -45,33 +45,18 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
<version>${geronimo.wsmetadata.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.examples</groupId>
+
<artifactId>org.apache.servicemix.examples.itests.test-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf.version}</version>
- <executions>
- <execution>
- <id>generate-test-sources</id>
- <phase>generate-sources</phase>
- <configuration>
-
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
- <wsdlOptions>
- <wsdlOption>
-
<wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
- </wsdlOption>
- </wsdlOptions>
- </configuration>
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
@@ -103,9 +88,10 @@
org.apache.activemq.store.amq,
org.apache.activemq.usage,
org.apache.activemq.broker,
- javax.jms
+ javax.jms,
+ org.apache.servicemix.examples.cxf
</Import-Package>
-
<Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
+
<Export-Package>org.apache.servicemix.examples.cxf_jms_osgi</Export-Package>
<Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
</instructions>
</configuration>
Added:
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/java/org/apache/servicemix/examples/cxf-jms-osgi/HelloWorldImpl.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/java/org/apache/servicemix/examples/cxf-jms-osgi/HelloWorldImpl.java?rev=986579&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/java/org/apache/servicemix/examples/cxf-jms-osgi/HelloWorldImpl.java
(added)
+++
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/java/org/apache/servicemix/examples/cxf-jms-osgi/HelloWorldImpl.java
Wed Aug 18 06:50:46 2010
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// START SNIPPET: service
+package org.apache.servicemix.examples.cxf_jms_osgi;
+
+import javax.jws.WebService;
+import org.apache.servicemix.examples.cxf.*;
+
+//@WebService(endpointInterface =
"org.apache.servicemix.examples.cxf.HelloWorld")
+...@webservice(serviceName = "HelloWorldImplService",
+ portName = "HelloWorldImplPort",
+ endpointInterface =
"org.apache.servicemix.examples.cxf.HelloWorld",
+ targetNamespace = "http://cxf.examples.servicemix.apache.org/";)
+public class HelloWorldImpl implements HelloWorld {
+
+ public String sayHi(String text) {
+ return "Hello " + text;
+ }
+}
+// END SNIPPET: service
Modified:
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml?rev=986579&r1=986578&r2=986579&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml
(original)
+++
servicemix/smx4/features/trunk/examples/itests/cxf-jms-osgi/src/main/resources/META-INF/spring/beans.xml
Wed Aug 18 06:50:46 2010
@@ -32,7 +32,7 @@
<import resource="classpath:META-INF/cxf/cxf-extension-jms.xml" />
<jaxws:endpoint id="JMSEndpoint"
- implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
+
implementor="org.apache.servicemix.examples.cxf_jms_osgi.HelloWorldImpl"
wsdlLocation="wsdl/hello_world.wsdl"
endpointName="e:HelloWorldImplPort"
serviceName="s:HelloWorldImplService"
Modified: servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml?rev=986579&r1=986578&r2=986579&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml
(original)
+++ servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/pom.xml Wed Aug
18 06:50:46 2010
@@ -45,33 +45,16 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
<version>${geronimo.wsmetadata.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.examples</groupId>
+
<artifactId>org.apache.servicemix.examples.itests.test-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf.version}</version>
- <executions>
- <execution>
- <id>generate-test-sources</id>
- <phase>generate-sources</phase>
- <configuration>
-
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
- <wsdlOptions>
- <wsdlOption>
-
<wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
- </wsdlOption>
- </wsdlOptions>
- </configuration>
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
@@ -96,9 +79,10 @@
org.apache.servicemix.nmr.api,
org.apache.servicemix.cxf.transport.nmr,
org.apache.servicemix.nmr.api.event,
- org.apache.servicemix.nmr.api.internal
+ org.apache.servicemix.nmr.api.internal,
+ org.apache.servicemix.examples.cxf
</Import-Package>
-
<Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
+
<Export-Package>org.apache.servicemix.examples.cxf_nmr_osgi</Export-Package>
<Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
</instructions>
</configuration>
Added:
servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/java/org/apache/servicemix/examples/cxf_nmr_osgi/HelloWorldImpl.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/java/org/apache/servicemix/examples/cxf_nmr_osgi/HelloWorldImpl.java?rev=986579&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/java/org/apache/servicemix/examples/cxf_nmr_osgi/HelloWorldImpl.java
(added)
+++
servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/java/org/apache/servicemix/examples/cxf_nmr_osgi/HelloWorldImpl.java
Wed Aug 18 06:50:46 2010
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+// START SNIPPET: service
+package org.apache.servicemix.examples.cxf_nmr_osgi;
+
+import javax.jws.WebService;
+import org.apache.servicemix.examples.cxf.*;
+//@WebService(endpointInterface =
"org.apache.servicemix.examples.cxf.HelloWorld")
+...@webservice(serviceName = "HelloWorldImplService",
+ portName = "HelloWorldImplPort",
+ endpointInterface =
"org.apache.servicemix.examples.cxf.HelloWorld",
+ targetNamespace = "http://cxf.examples.servicemix.apache.org/";)
+public class HelloWorldImpl implements HelloWorld {
+
+ public String sayHi(String text) {
+ return "Hello " + text;
+ }
+}
+// END SNIPPET: service
Modified:
servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml?rev=986579&r1=986578&r2=986579&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml
(original)
+++
servicemix/smx4/features/trunk/examples/itests/cxf-nmr-osgi/src/main/resources/META-INF/spring/beans.xml
Wed Aug 18 06:50:46 2010
@@ -32,7 +32,7 @@
<import
resource="classpath:META-INF/cxf/transport/nmr/cxf-transport-nmr.xml" />
<jaxws:endpoint id="NMREndpoint"
- implementor="org.apache.servicemix.examples.cxf.HelloWorldImpl"
+
implementor="org.apache.servicemix.examples.cxf_nmr_osgi.HelloWorldImpl"
endpointName="e:HelloWorldImplPort"
serviceName="s:HelloWorldImplService"
xmlns:e="http://cxf.examples.servicemix.apache.org/";
Modified: servicemix/smx4/features/trunk/examples/itests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/pom.xml?rev=986579&r1=986578&r2=986579&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/pom.xml Wed Aug 18 06:50:46
2010
@@ -32,6 +32,7 @@
<modules>
+ <module>test-commons</module>
<module>cxf-http-osgi</module>
<module>cxf-ws-security-osgi</module>
<module>cxf-jms-osgi</module>
Added: servicemix/smx4/features/trunk/examples/itests/test-commons/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/test-commons/pom.xml?rev=986579&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/test-commons/pom.xml (added)
+++ servicemix/smx4/features/trunk/examples/itests/test-commons/pom.xml Wed Aug
18 06:50:46 2010
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd";>
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.examples</groupId>
+ <artifactId>org.apache.servicemix.examples.itests</artifactId>
+ <version>4.3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.examples</groupId>
+ <artifactId>org.apache.servicemix.examples.itests.test-commons</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache ServiceMix Example ITESTS BUNDLE :: COMMON CLASSES</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>${geronimo.wsmetadata.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${cxf.version}</version>
+ <executions>
+ <execution>
+ <id>generate-test-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
+ <wsdlOptions>
+ <wsdlOption>
+
<wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
+ </wsdlOption>
+ </wsdlOptions>
+ </configuration>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Import-Package>
+ javax.jws,
+ javax.wsdl,
+ javax.xml.bind,
+ javax.xml.bind.annotation,
+ javax.xml.namespace,
+ javax.xml.ws,
+ META-INF.cxf,
+ META-INF.cxf.osgi,
+ org.apache.cxf.bus,
+ org.apache.cxf.bus.spring,
+ org.apache.cxf.bus.resource,
+ org.apache.cxf.configuration.spring,
+ org.apache.cxf.resource,
+ org.apache.cxf.transport.http_osgi,
+ org.springframework.beans.factory.config
+ </Import-Package>
+
<Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
+ <Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added:
servicemix/smx4/features/trunk/examples/itests/test-commons/src/main/resources/wsdl/hello_world.wsdl
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/test-commons/src/main/resources/wsdl/hello_world.wsdl?rev=986579&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/test-commons/src/main/resources/wsdl/hello_world.wsdl
(added)
+++
servicemix/smx4/features/trunk/examples/itests/test-commons/src/main/resources/wsdl/hello_world.wsdl
Wed Aug 18 06:50:46 2010
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<wsdl:definitions name="HelloWorldImplService"
+ targetNamespace="http://cxf.examples.servicemix.apache.org/";
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
+ xmlns:tns="http://cxf.examples.servicemix.apache.org/";
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+ <wsdl:types>
+ <xsd:schema attributeFormDefault="unqualified"
+ elementFormDefault="unqualified"
+
targetNamespace="http://cxf.examples.servicemix.apache.org/";
+ xmlns:tns="http://cxf.examples.servicemix.apache.org/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+ <xsd:element name="sayHi" type="tns:sayHi" />
+ <xsd:complexType name="sayHi">
+ <xsd:sequence>
+ <xsd:element minOccurs="0" name="arg0" type="xsd:string" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="sayHiResponse" type="tns:sayHiResponse" />
+ <xsd:complexType name="sayHiResponse">
+ <xsd:sequence>
+ <xsd:element minOccurs="0" name="return" type="xsd:string"
/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="sayHiResponse">
+ <wsdl:part element="tns:sayHiResponse" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="sayHi">
+ <wsdl:part element="tns:sayHi" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="HelloWorld">
+ <wsdl:operation name="sayHi">
+ <wsdl:input message="tns:sayHi" name="sayHi">
+ </wsdl:input>
+ <wsdl:output message="tns:sayHiResponse" name="sayHiResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="HelloWorldImplServiceSoapBinding"
type="tns:HelloWorld">
+ <soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"; />
+ <wsdl:operation name="sayHi">
+ <soap:operation soapAction="" style="document" />
+ <wsdl:input name="sayHi">
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output name="sayHiResponse">
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="HelloWorldImplService">
+ <wsdl:port binding="tns:HelloWorldImplServiceSoapBinding"
name="HelloWorldImplPort">
+ <soap:address location="http://localhost:8181/cxf/HelloWorld"; />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=986579&r1=986578&r2=986579&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Wed Aug 18
06:50:46 2010
@@ -217,6 +217,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.examples</groupId>
+
<artifactId>org.apache.servicemix.examples.itests.test-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.examples</groupId>
<artifactId>org.apache.servicemix.examples.itests.cxf-http-osgi</artifactId>
<version>${project.version}</version>
</dependency>
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=986579&r1=986578&r2=986579&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
Wed Aug 18 06:50:46 2010
@@ -124,6 +124,7 @@ public class CXFNMRIntegrationTest exten
getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.management"),
getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.osgi"),
getBundle("org.apache.servicemix.document",
"org.apache.servicemix.document"),
+ getBundle("org.apache.servicemix.examples",
"org.apache.servicemix.examples.itests.test-commons"),
getBundle("org.apache.servicemix.examples",
"org.apache.servicemix.examples.itests.cxf-nmr-osgi"),
};
}
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=986579&r1=986578&r2=986579&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Wed Aug 18 06:50:46 2010
@@ -152,6 +152,7 @@ public class IntegrationTest extends Abs
getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.management"),
getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.osgi"),
getBundle("org.apache.servicemix.document",
"org.apache.servicemix.document"),
+ getBundle("org.apache.servicemix.examples",
"org.apache.servicemix.examples.itests.test-commons"),
getBundle("org.apache.servicemix.examples",
"org.apache.servicemix.examples.itests.cxf-http-osgi"),
getBundle("org.apache.servicemix.examples",
"org.apache.servicemix.examples.itests.cxf-ws-security-osgi"),
getBundle("org.apache.servicemix.examples",
"org.apache.servicemix.examples.itests.cxf-jms-osgi"),
