Author: dkulp
Date: Wed Sep 26 18:24:44 2012
New Revision: 1390637
URL: http://svn.apache.org/viewvc?rev=1390637&view=rev
Log:
Polish the WS-Discovery sample a bit. Add a README
Added:
cxf/trunk/distribution/src/main/release/samples/ws-discovery/README.txt
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/Client.java
- copied, changed from r1390602,
cxf/trunk/distribution/src/main/release/samples/ws-discovery/client/src/main/java/org/apache/cxf/samples/discovery/Client.java
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java
- copied, changed from r1390602,
cxf/trunk/distribution/src/main/release/samples/ws-discovery/service/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/Main.java
- copied, changed from r1390602,
cxf/trunk/distribution/src/main/release/samples/ws-discovery/service/src/main/java/org/apache/cxf/samples/discovery/Main.java
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/resources/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/resources/org/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/resources/org/apache/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/resources/org/apache/cxf/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/resources/org/apache/cxf/hello_world/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/resources/org/apache/cxf/hello_world/discovery/
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/resources/org/apache/cxf/hello_world/discovery/hello_world.wsdl
- copied, changed from r1390602,
cxf/trunk/distribution/src/main/release/samples/ws-discovery/common/src/main/resources/org/apache/cxf/hello_world/discovery/hello_world.wsdl
Removed:
cxf/trunk/distribution/src/main/release/samples/ws-discovery/client/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws-discovery/client/src/main/java/org/apache/cxf/samples/discovery/Client.java
cxf/trunk/distribution/src/main/release/samples/ws-discovery/common/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws-discovery/common/src/main/resources/org/apache/cxf/hello_world/discovery/hello_world.wsdl
cxf/trunk/distribution/src/main/release/samples/ws-discovery/service/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws-discovery/service/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java
cxf/trunk/distribution/src/main/release/samples/ws-discovery/service/src/main/java/org/apache/cxf/samples/discovery/Main.java
Modified:
cxf/trunk/distribution/src/main/release/samples/ws-discovery/pom.xml
Added: cxf/trunk/distribution/src/main/release/samples/ws-discovery/README.txt
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws-discovery/README.txt?rev=1390637&view=auto
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws-discovery/README.txt
(added)
+++ cxf/trunk/distribution/src/main/release/samples/ws-discovery/README.txt Wed
Sep 26 18:24:44 2012
@@ -0,0 +1,37 @@
+WS-Discovery Demo
+====================
+
+This demo shows how to use the WS-Discovery service and API's
+provided by Apache CXF.
+
+
+Please review the README in the samples directory before continuing.
+
+
+Building and running the demo using Maven
+-----------------------------------------
+
+From the base directory of this sample (i.e., where this README file is
+located), the maven pom.xml file can be used to build and run the demo.
+
+Using either UNIX or Windows:
+
+ mvn install (builds the demo)
+ mvn -Pservice (from one ore more command line windows)
+ Mvn -Pclient (from a second command line window)
+
+The "service" profiles will startup a simple "Greeter" service on a random
+port. Because it is a random port, there is no way for the clients to
+know where that service is deployed. The service publishes itself
+automatically using WS-Discovery and will respond to WS-Discovery queries.
+
+The "client" profile will launch a client application that will use the CXF
+WS-Discovery API's to probe the network for all the "'Greeter" services
+that are available. It will then iterate through all of them and call
+the greetMe method.
+
+You can run multiple instances of the service in separate command line
+windows. The client will detect them all via WS-Discovery and call
+off to all of them.
+
+
Modified: cxf/trunk/distribution/src/main/release/samples/ws-discovery/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws-discovery/pom.xml?rev=1390637&r1=1390636&r2=1390637&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws-discovery/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ws-discovery/pom.xml Wed
Sep 26 18:24:44 2012
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.samples.wsdiscovery</groupId>
<artifactId>cxf-samples-wsdiscovery</artifactId>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<name>WS-Discovery Sample</name>
<description>WS-Discovery Sample</description>
<version>2.7.0-SNAPSHOT</version>
@@ -30,9 +30,128 @@
<artifactId>cxf-samples</artifactId>
<version>2.7.0-SNAPSHOT</version>
</parent>
- <modules>
- <module>common</module>
- <module>service</module>
- <module>client</module>
- </modules>
+ <properties>
+ <cxf.version>${project.version}</cxf.version>
+ <cxf.xjc-utils.version>2.6.0</cxf.xjc-utils.version>
+ <cxf.release.base>${basedir}/../..</cxf.release.base>
+ </properties>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>2.7.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>2.7.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.services.ws-discovery</groupId>
+ <artifactId>cxf-services-ws-discovery-api</artifactId>
+ <version>2.7.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.services.ws-discovery</groupId>
+ <artifactId>cxf-services-ws-discovery-service</artifactId>
+ <version>2.7.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <wsdlOptions>
+ <wsdlOption>
+
<wsdl>src/main/resources/org/apache/cxf/hello_world/discovery/hello_world.wsdl</wsdl>
+ </wsdlOption>
+ </wsdlOptions>
+ </configuration>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>service</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+
<mainClass>org.apache.cxf.samples.discovery.Main</mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>client</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+
<mainClass>org.apache.cxf.samples.discovery.Client</mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Copied:
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/Client.java
(from r1390602,
cxf/trunk/distribution/src/main/release/samples/ws-discovery/client/src/main/java/org/apache/cxf/samples/discovery/Client.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/Client.java?p2=cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/Client.java&p1=cxf/trunk/distribution/src/main/release/samples/ws-discovery/client/src/main/java/org/apache/cxf/samples/discovery/Client.java&r1=1390602&r2=1390637&rev=1390637&view=diff
==============================================================================
(empty)
Copied:
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java
(from r1390602,
cxf/trunk/distribution/src/main/release/samples/ws-discovery/service/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java?p2=cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java&p1=cxf/trunk/distribution/src/main/release/samples/ws-discovery/service/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java&r1=1390602&r2=1390637&rev=1390637&view=diff
==============================================================================
(empty)
Copied:
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/Main.java
(from r1390602,
cxf/trunk/distribution/src/main/release/samples/ws-discovery/service/src/main/java/org/apache/cxf/samples/discovery/Main.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/Main.java?p2=cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/java/org/apache/cxf/samples/discovery/Main.java&p1=cxf/trunk/distribution/src/main/release/samples/ws-discovery/service/src/main/java/org/apache/cxf/samples/discovery/Main.java&r1=1390602&r2=1390637&rev=1390637&view=diff
==============================================================================
(empty)
Copied:
cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/resources/org/apache/cxf/hello_world/discovery/hello_world.wsdl
(from r1390602,
cxf/trunk/distribution/src/main/release/samples/ws-discovery/common/src/main/resources/org/apache/cxf/hello_world/discovery/hello_world.wsdl)
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/resources/org/apache/cxf/hello_world/discovery/hello_world.wsdl?p2=cxf/trunk/distribution/src/main/release/samples/ws-discovery/src/main/resources/org/apache/cxf/hello_world/discovery/hello_world.wsdl&p1=cxf/trunk/distribution/src/main/release/samples/ws-discovery/common/src/main/resources/org/apache/cxf/hello_world/discovery/hello_world.wsdl&r1=1390602&r2=1390637&rev=1390637&view=diff
==============================================================================
(empty)