incubator-yoko-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eno...@apache.org
Subject svn commit: r486179 - in /incubator/yoko/trunk/distribution: ./ src/main/samples/ws/bank/ src/main/samples/ws/bank/src/yoko/server/ src/main/samples/ws/hello_world/ src/main/samples/ws/hello_world/src/yoko/server/
Date Tue, 12 Dec 2006 15:06:38 GMT
Author: enolan
Date: Tue Dec 12 07:06:37 2006
New Revision: 486179

URL: http://svn.apache.org/viewvc?view=rev&rev=486179
Log:
Yoko-238 - Update Demos to use cxf instead of celtix.

Removed:
    incubator/yoko/trunk/distribution/src/main/samples/ws/bank/celtix-yoko-router.xml
    incubator/yoko/trunk/distribution/src/main/samples/ws/bank/router.wsdl
Modified:
    incubator/yoko/trunk/distribution/pom.xml
    incubator/yoko/trunk/distribution/src/main/samples/ws/bank/README.txt
    incubator/yoko/trunk/distribution/src/main/samples/ws/bank/build.xml
    incubator/yoko/trunk/distribution/src/main/samples/ws/bank/src/yoko/server/BankImpl.java
    incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/README.txt
    incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/build.xml
    incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/yoko/server/HelloWorldImpl.java

Modified: incubator/yoko/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/pom.xml?view=diff&rev=486179&r1=486178&r2=486179
==============================================================================
--- incubator/yoko/trunk/distribution/pom.xml (original)
+++ incubator/yoko/trunk/distribution/pom.xml Tue Dec 12 07:06:37 2006
@@ -51,6 +51,11 @@
             <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-bindings</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-tools-wsdl2java</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

Modified: incubator/yoko/trunk/distribution/src/main/samples/ws/bank/README.txt
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/src/main/samples/ws/bank/README.txt?view=diff&rev=486179&r1=486178&r2=486179
==============================================================================
--- incubator/yoko/trunk/distribution/src/main/samples/ws/bank/README.txt (original)
+++ incubator/yoko/trunk/distribution/src/main/samples/ws/bank/README.txt Tue Dec 12 07:06:37
2006
@@ -22,19 +22,12 @@
 
   In this use case, a Web services client talks to a Web services server
 through the IIOP protocol. Both the client and the server are implemented using
-the celtix Web services framework and the IIOP protocol is enabled by installing
-the Yoko CORBA binding into celtix.
+the CXF Web services framework and the IIOP protocol is enabled by installing
+the Yoko CORBA binding into CXF.
 
-  Note: celtix is _not_ part of the Yoko product, but a celtix kit is bundled
+  Note: CXF is _not_ part of the Yoko product, but a CXF kit is bundled
 with Yoko for convenience of testing and running the Web services demos.
 
-- Case 2: SOAP web services client & Web services server through a Router.
-
-  In this use case, a Celtix Soap client talks to a Web services server through the
-router. 
-
-This use case illustrates how a Web service can be made accessible to SOAP clients.
-
 
 Building the Demo
 =================
@@ -47,7 +40,7 @@
 
      ant
 
-  This command uses the celtix wsdl2java utility to generate the server & client code.
+  This command uses the CXF wsdl2java utility to generate the server & client code.
 
 
 Running the Demo - Use Case 1
@@ -62,13 +55,13 @@
    UNIX (must use forward slashes):
 
      java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-M2-SNAPSHOT.jar
\
-     -Dceltix.config.file=file:$YOKO_HOME/samples/ws/etc/corba_bus_config.xml \
+     -Dcxf.config.file=file:$YOKO_HOME/samples/ws/etc/corba_bus_config.xml \
      -classpath $CLASSPATH:build/classes yoko.server.Server &
 
    Windows (may use either forward or back slashes):
 
      start java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-M2-SNAPSHOT.jar

-        -Dceltix.config.file=file:/%YOKO_HOME%\samples\ws\etc\corba_bus_config.xml
+        -Dcxf.config.file=file:/%YOKO_HOME%\samples\ws\etc\corba_bus_config.xml
         -classpath %CLASSPATH%;build\classes yoko.server.Server
 
   The server process starts in the background. We have to set the Xbootclasspath,
@@ -79,71 +72,18 @@
    UNIX:
 
      java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-M2-SNAPSHOT.jar
\
-        -Dceltix.config.file=file:$YOKO_HOME/samples/ws/etc/corba_bus_config.xml \
+        -Dcxf.config.file=file:$YOKO_HOME/samples/ws/etc/corba_bus_config.xml \
         -classpath $CLASSPATH:build/classes yoko.client.Client
 
    Windows:
 
      java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-M2-SNAPSHOT.jar
-        -Dceltix.config.file=file:/%YOKO_HOME%\samples\ws\etc\corba_bus_config.xml
+        -Dcxf.config.file=file:/%YOKO_HOME%\samples\ws\etc\corba_bus_config.xml
         -classpath %CLASSPATH%;build\classes yoko.client.Client
 
 4. After running the client, use the kill command to terminate the server process (UNIX)
or
    type Ctrl-C in the server's command window (Windows).
 
-
-Running the Demo - Use Case 2
-=============================
-
-To run the demo for the second use case, perform the following steps:
-
-1. Open a command prompt and move into the directory <YOKO_HOME>/samples/ws/bank
-
-2. Enter the following command to start the server (on a single command line):
-
-   UNIX (must use forward slashes):
-
-     java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-M2-SNAPSHOT.jar
\
-        -Dceltix.config.file=file:$YOKO_HOME/samples/ws/etc/corba_bus_config.xml \
-        -classpath $CLASSPATH:build/classes:. yoko.server.Server &
-
-   Windows (may use either forward or back slashes):
-
-     start java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-M2-SNAPSHOT.jar

-        -Dceltix.config.file=file:/%YOKO_HOME%\samples\ws\etc\corba_bus_config.xml
-        -classpath %CLASSPATH%;build\classes;. yoko.server.Server
-
-  The server process starts in the background. We have to set the Xbootclasspath,
-  because the ORB classes in Yoko conflict with the JDK ORB classes.
-
-3. Enter the following command to start the celtix router (on a single command line):
-
-   UNIX (must use forward slashes):
-
-     java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-M2-SNAPSHOT.jar
\
-        -Dceltix.config.file=file:$YOKO_HOME/samples/ws/etc/corba_bus_config.xml \
-        -classpath $CLASSPATH:build/classes:. org.objectweb.celtix.routing.RouterManager
\
-        -BUSid celtix-yoko &
-
-   Windows (may use either forward or back slashes):
-
-     start java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-M2-SNAPSHOT.jar

-        -Dceltix.config.file=file:/%YOKO_HOME%\samples\ws\etc\corba_bus_config.xml
-        -classpath %CLASSPATH%;build\classes;. org.objectweb.celtix.routing.RouterManager

-        -BUSid celtix-yoko
-
-4. Enter the following command to start the soap client:
-
-   UNIX:
-
-     java -classpath $CLASSPATH:build/classes:. soap.client.Client
-
-   Windows:
-
-     java -classpath %CLASSPATH%;build\classes;. soap.client.Client
-
-4. After running the client, use the kill command to terminate the server & router process
(UNIX) or
-   type Ctrl-C in the server's & router's command window (Windows).
 
 Cleanup
 =======

Modified: incubator/yoko/trunk/distribution/src/main/samples/ws/bank/build.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/src/main/samples/ws/bank/build.xml?view=diff&rev=486179&r1=486178&r2=486179
==============================================================================
--- incubator/yoko/trunk/distribution/src/main/samples/ws/bank/build.xml (original)
+++ incubator/yoko/trunk/distribution/src/main/samples/ws/bank/build.xml Tue Dec 12 07:06:37
2006
@@ -87,7 +87,7 @@
         <sequential>
             <mkdir dir="@{srcdestdir}"/>
             <mkdir dir="@{destdir}"/>
-            <java failonerror="true" classname="org.objectweb.celtix.tools.WSDLToJava"
fork="yes">
+            <java failonerror="true" classname="org.apache.cxf.tools.wsdl2java.WSDLToJava"
fork="yes">
                 <classpath>
                     <path refid="yoko.classpath" />
                 </classpath>

Modified: incubator/yoko/trunk/distribution/src/main/samples/ws/bank/src/yoko/server/BankImpl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/src/main/samples/ws/bank/src/yoko/server/BankImpl.java?view=diff&rev=486179&r1=486178&r2=486179
==============================================================================
--- incubator/yoko/trunk/distribution/src/main/samples/ws/bank/src/yoko/server/BankImpl.java
(original)
+++ incubator/yoko/trunk/distribution/src/main/samples/ws/bank/src/yoko/server/BankImpl.java
Tue Dec 12 07:06:37 2006
@@ -32,10 +32,10 @@
 import bank.server.AccountNotFoundExceptionType;
 import bank.server.Bank;
 
-@javax.jws.WebService(name = "Bank", serviceName = "BankCORBAService", 
+@javax.jws.WebService(portName = "BankCORBAPort", serviceName = "BankCORBAService", 
                       targetNamespace = "http://schemas.apache.org/yoko/idl/bank", 
-                      wsdlLocation = "file:./../resources/bank.wsdl")
-                      
+                      endpointInterface = "bank.server.Bank")
+
 public class BankImpl implements Bank {
 
     private static final Logger LOG = 

Modified: incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/README.txt
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/README.txt?view=diff&rev=486179&r1=486178&r2=486179
==============================================================================
--- incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/README.txt (original)
+++ incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/README.txt Tue Dec 12
07:06:37 2006
@@ -22,16 +22,16 @@
 
   In this use case, a Web services client talks to a Web services server
 through the IIOP protocol. Both the client and the server are implemented using
-the celtix Web services framework and the IIOP protocol is enabled by installing
-the Yoko CORBA binding into celtix.
+the CXF Web services framework and the IIOP protocol is enabled by installing
+the Yoko CORBA binding into CXF.
 
-  Note: celtix is _not_ part of the Yoko product, but a celtix kit is bundled
+  Note: CXF is _not_ part of the Yoko product, but a CXF kit is bundled
 with Yoko for convenience of testing and running the Web services demos.
 
 - Case 2: Web services client & CORBA server.
 
   In this use case, a Web services client talks to a CORBA server through the
-IIOP protocol.  The client, which is implemented using celtix, loads the
+IIOP protocol.  The client, which is implemented using CXF, loads the
 Yoko CORBA binding to enable the IIOP protocol. The server is implemented using
 the Yoko ORB.
 
@@ -43,7 +43,7 @@
 
   In this use case, a CORBA client talks to a Web services server through the
 IIOP protocol. The client is implemented using the Yoko ORB. The server, which is
-implemented using celtix, loads the Yoko CORBA binding to enable the IIOP protocol.
+implemented using CXF, loads the Yoko CORBA binding to enable the IIOP protocol.
 
 This use case illustrates how a Web service can be made accessible to CORBA clients,
 by exposing the service through an OMG IDL interface that can be accessed
@@ -83,7 +83,7 @@
 
      ant build
 
-  This command uses the celtix wsdl2java utility to generate the server & client code.
+  This command uses the CXF wsdl2java utility to generate the server & client code.
 
 
 Running the Demo - Use Case 1
@@ -98,13 +98,11 @@
    UNIX (must use forward slashes):
 
      java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-M2-SNAPSHOT.jar

-        -Dceltix.config.file=file:$YOKO_HOME/samples/ws/etc/corba_bus_config.xml
         -classpath $CLASSPATH:build/classes yoko.server.Server &
 
    Windows (may use either forward or back slashes):
 
      start java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-M2-SNAPSHOT.jar

-        -Dceltix.config.file=file:/%YOKO_HOME%\samples\ws\etc\corba_bus_config.xml
         -classpath %CLASSPATH%;build\classes yoko.server.Server
 
   The server process starts in the background. We have to set the Xbootclasspath,
@@ -115,13 +113,11 @@
    UNIX:
 
      java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-M2-SNAPSHOT.jar

-        -Dceltix.config.file=file:$YOKO_HOME/samples/ws/etc/corba_bus_config.xml 
         -classpath $CLASSPATH:build/classes yoko.client.Client <Name>
 
    Windows:
 
      java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-M2-SNAPSHOT.jar
-        -Dceltix.config.file=file:/%YOKO_HOME%\samples\ws\etc\corba_bus_config.xml
         -classpath %CLASSPATH%;build\classes yoko.client.Client <Name>
 
 4. After running the client, use the kill command to terminate the server process (UNIX)
or
@@ -155,13 +151,11 @@
    UNIX:
 
      java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-M2-SNAPSHOT.jar

-        -Dceltix.config.file=file:$YOKO_HOME/samples/ws/etc/corba_bus_config.xml 
         -classpath $CLASSPATH:build/classes yoko.client.Client <Name>
 
    Windows:
 
      java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-M2-SNAPSHOT.jar
-        -Dceltix.config.file=file:/%YOKO_HOME%\samples\ws\etc\corba_bus_config.xml
         -classpath %CLASSPATH%;build\classes yoko.client.Client <Name>
 
 4. After running the client, use the kill command to terminate the server process (UNIX)
or
@@ -180,13 +174,11 @@
    UNIX (must use forward slashes):
 
      java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-M2-SNAPSHOT.jar

-        -Dceltix.config.file=file:$YOKO_HOME/samples/ws/etc/corba_bus_config.xml
         -classpath $CLASSPATH:build/classes yoko.server.Server &
 
    Windows (may use either forward or back slashes):
 
      start java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-M2-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-M2-SNAPSHOT.jar

-        -Dceltix.config.file=file:/%YOKO_HOME%\samples\ws\etc\corba_bus_config.xml
         -classpath %CLASSPATH%;build\classes yoko.server.Server
 
   The server process starts in the background. We have to set the Xbootclasspath,

Modified: incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/build.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/build.xml?view=diff&rev=486179&r1=486178&r2=486179
==============================================================================
--- incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/build.xml (original)
+++ incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/build.xml Tue Dec 12
07:06:37 2006
@@ -113,7 +113,7 @@
         <sequential>
             <mkdir dir="@{srcdestdir}"/>
             <mkdir dir="@{destdir}"/>
-            <java failonerror="true" classname="org.objectweb.celtix.tools.WSDLToJava"
fork="yes">
+            <java failonerror="true" classname="org.apache.cxf.tools.wsdl2java.WSDLToJava"
fork="yes">
                 <classpath>
                     <path refid="yoko.classpath" />
                 </classpath>

Modified: incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/yoko/server/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/yoko/server/HelloWorldImpl.java?view=diff&rev=486179&r1=486178&r2=486179
==============================================================================
--- incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/yoko/server/HelloWorldImpl.java
(original)
+++ incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/yoko/server/HelloWorldImpl.java
Tue Dec 12 07:06:37 2006
@@ -23,9 +23,9 @@
 import javax.jws.WebMethod;
 import javax.jws.WebResult;
 
-@javax.jws.WebService(name = "HelloWorld", serviceName = "HelloWorldCORBAService", 
+@javax.jws.WebService(portName = "HelloWorldCORBAPort", serviceName = "HelloWorldCORBAService",

                       targetNamespace = "http://schemas.apache.org/yoko/idl/HelloWorld",

-                      wsdlLocation = "file:./HelloWorld-corba.wsdl")
+                      endpointInterface = "yoko.server.HelloWorld")
                       
 public class HelloWorldImpl implements HelloWorld {
 



Mime
View raw message