cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r636910 - in /incubator/cxf/trunk: distribution/src/main/release/samples/corba/bank_ws_addressing/ distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/ distribution/src/main/release/samples/corba/bank_ws_addressi...
Date Thu, 13 Mar 2008 22:52:02 GMT
Author: dkulp
Date: Thu Mar 13 15:51:39 2008
New Revision: 636910

URL: http://svn.apache.org/viewvc?rev=636910&view=rev
Log:
Get the last CORBA demo (the complex "Factory Pattern" one) working

Added:
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/
      - copied from r636829, incubator/yoko/trunk/distribution/src/main/samples/ws/bank_ws_addressing/
Modified:
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/BankWS-corba.wsdl
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Account_impl.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Bank_impl.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/client/Client.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/AccountImpl.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/BankImpl.java
    incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/Server.java
    incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
    incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/Messages.properties

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/BankWS-corba.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/BankWS-corba.wsdl?rev=636910&r1=636829&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/BankWS-corba.wsdl (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/BankWS-corba.wsdl Thu Mar 13 15:51:39 2008
@@ -1,390 +1,390 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Bank" xmlns:tns="http://schemas.apache.org/yoko/idl/Bank" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:corba="http://schemas.apache.org/yoko/bindings/corba" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/Bank/typemap">
-    <corba:object xmlns:ns4="http://www.w3.org/2005/08/addressing" xmlns="http://schemas.apache.org/yoko/idl/Bank" binding="AccountCORBABinding" repositoryID="IDL:Account:1.0" type="ns4:EndpointReferenceType" name="Account" />
-    <corba:object xmlns="http://www.w3.org/2005/08/addressing" repositoryID="IDL:omg.org/CORBA/Object/1.0" type="EndpointReferenceType" name="CORBA.Object" />
-  </corba:typeMapping>
-  <wsdl:types>
-    <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Bank" xmlns="http://schemas.apache.org/yoko/idl/Bank" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd">
-      </xs:import>
-      <xs:element name="get_balance">
-        <xs:complexType>
-          <xs:sequence>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="get_balanceResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="return" type="xs:float">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="deposit">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="addition" type="xs:float">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="depositResponse">
-        <xs:complexType>
-          <xs:sequence>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="create_account">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="account_name" type="xs:string">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="create_accountResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="return" nillable="true" type="wsa:EndpointReferenceType">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="AccountRef" type="wsa:EndpointReferenceType">
-        <xs:annotation>
-          <xs:appinfo>
-          </xs:appinfo>
-        </xs:annotation>
-      </xs:element>
-      <xs:element name="create_epr_account">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="account_name" type="xs:string">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="create_epr_accountResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="return" nillable="true" type="wsa:EndpointReferenceType">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="get_account">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="account_name" type="xs:string">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="get_accountResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="return" nillable="true" type="wsa:EndpointReferenceType">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="get_epr_account">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="account_name" type="xs:string">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="get_epr_accountResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="return" nillable="true" type="wsa:EndpointReferenceType">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="get_account_epr_with_no_use_attribute">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="account_name" type="xs:string">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="get_account_epr_with_no_use_attributeResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="return" nillable="true" type="wsa:EndpointReferenceType">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="find_account">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="account_details" type="xs:anyType">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="find_accountResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="account_details" type="xs:anyType">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="remove_account">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="account_name" type="xs:string">
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="remove_accountResponse">
-        <xs:complexType>
-          <xs:sequence>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-    </xs:schema>
-  </wsdl:types>
-  <wsdl:message name="remove_account">
-    <wsdl:part name="inparameter" element="tns:remove_account">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="create_epr_accountResponse">
-    <wsdl:part name="outparameter" element="tns:create_epr_accountResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="get_account">
-    <wsdl:part name="inparameter" element="tns:get_account">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="get_epr_accountResponse">
-    <wsdl:part name="outparameter" element="tns:get_epr_accountResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="get_balanceResponse">
-    <wsdl:part name="outparameter" element="tns:get_balanceResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="get_epr_account">
-    <wsdl:part name="inparameter" element="tns:get_epr_account">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="get_accountResponse">
-    <wsdl:part name="outparameter" element="tns:get_accountResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="get_balance">
-    <wsdl:part name="inparameter" element="tns:get_balance">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="create_account">
-    <wsdl:part name="inparameter" element="tns:create_account">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="remove_accountResponse">
-    <wsdl:part name="outparameter" element="tns:remove_accountResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="deposit">
-    <wsdl:part name="inparameter" element="tns:deposit">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="create_accountResponse">
-    <wsdl:part name="outparameter" element="tns:create_accountResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="find_accountResponse">
-    <wsdl:part name="outparameter" element="tns:find_accountResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="get_account_epr_with_no_use_attributeResponse">
-    <wsdl:part name="outparameter" element="tns:get_account_epr_with_no_use_attributeResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="find_account">
-    <wsdl:part name="inparameter" element="tns:find_account">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="create_epr_account">
-    <wsdl:part name="inparameter" element="tns:create_epr_account">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="get_account_epr_with_no_use_attribute">
-    <wsdl:part name="inparameter" element="tns:get_account_epr_with_no_use_attribute">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="depositResponse">
-    <wsdl:part name="outparameter" element="tns:depositResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="Bank">
-    <wsdl:operation name="create_account">
-      <wsdl:input name="create_accountRequest" message="tns:create_account">
-    </wsdl:input>
-      <wsdl:output name="create_accountResponse" message="tns:create_accountResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="create_epr_account">
-      <wsdl:input name="create_epr_accountRequest" message="tns:create_epr_account">
-    </wsdl:input>
-      <wsdl:output name="create_epr_accountResponse" message="tns:create_epr_accountResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="get_account">
-      <wsdl:input name="get_accountRequest" message="tns:get_account">
-    </wsdl:input>
-      <wsdl:output name="get_accountResponse" message="tns:get_accountResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="get_epr_account">
-      <wsdl:input name="get_epr_accountRequest" message="tns:get_epr_account">
-    </wsdl:input>
-      <wsdl:output name="get_epr_accountResponse" message="tns:get_epr_accountResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="get_account_epr_with_no_use_attribute">
-      <wsdl:input name="get_account_epr_with_no_use_attributeRequest" message="tns:get_account_epr_with_no_use_attribute">
-    </wsdl:input>
-      <wsdl:output name="get_account_epr_with_no_use_attributeResponse" message="tns:get_account_epr_with_no_use_attributeResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="find_account">
-      <wsdl:input name="find_accountRequest" message="tns:find_account">
-    </wsdl:input>
-      <wsdl:output name="find_accountResponse" message="tns:find_accountResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="remove_account">
-      <wsdl:input name="remove_accountRequest" message="tns:remove_account">
-    </wsdl:input>
-      <wsdl:output name="remove_accountResponse" message="tns:remove_accountResponse">
-    </wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:portType name="Account">
-    <wsdl:operation name="get_balance">
-      <wsdl:input name="get_balanceRequest" message="tns:get_balance">
-    </wsdl:input>
-      <wsdl:output name="get_balanceResponse" message="tns:get_balanceResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="deposit">
-      <wsdl:input name="depositRequest" message="tns:deposit">
-    </wsdl:input>
-      <wsdl:output name="depositResponse" message="tns:depositResponse">
-    </wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="BankCORBABinding" type="tns:Bank">
-    <corba:binding repositoryID="IDL:Bank:1.0" />
-    <wsdl:operation name="create_account">
-      <corba:operation name="create_account">
-        <corba:param mode="in" name="account_name" idltype="corba:string" />
-        <corba:return xmlns="http://schemas.apache.org/yoko/idl/Bank/typemap" name="return" idltype="Account" />
-      </corba:operation>
-      <wsdl:input name="create_accountRequest">
-      </wsdl:input>
-      <wsdl:output name="create_accountResponse">
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="create_epr_account">
-      <corba:operation name="create_epr_account">
-        <corba:param mode="in" name="account_name" idltype="corba:string" />
-        <corba:return xmlns="http://schemas.apache.org/yoko/idl/Bank/typemap" name="return" idltype="CORBA.Object" />
-      </corba:operation>
-      <wsdl:input name="create_epr_accountRequest">
-      </wsdl:input>
-      <wsdl:output name="create_epr_accountResponse">
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="get_account">
-      <corba:operation name="get_account">
-        <corba:param mode="in" name="account_name" idltype="corba:string" />
-        <corba:return xmlns="http://schemas.apache.org/yoko/idl/Bank/typemap" name="return" idltype="Account" />
-      </corba:operation>
-      <wsdl:input name="get_accountRequest">
-      </wsdl:input>
-      <wsdl:output name="get_accountResponse">
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="get_epr_account">
-      <corba:operation name="get_epr_account">
-        <corba:param mode="in" name="account_name" idltype="corba:string" />
-        <corba:return xmlns="http://schemas.apache.org/yoko/idl/Bank/typemap" name="return" idltype="CORBA.Object" />
-      </corba:operation>
-      <wsdl:input name="get_epr_accountRequest">
-      </wsdl:input>
-      <wsdl:output name="get_epr_accountResponse">
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="get_account_epr_with_no_use_attribute">
-      <corba:operation name="get_account_epr_with_no_use_attribute">
-        <corba:param mode="in" name="account_name" idltype="corba:string" />
-        <corba:return xmlns="http://schemas.apache.org/yoko/idl/Bank/typemap" name="return" idltype="CORBA.Object" />
-      </corba:operation>
-      <wsdl:input name="get_account_epr_with_no_use_attributeRequest">
-      </wsdl:input>
-      <wsdl:output name="get_account_epr_with_no_use_attributeResponse">
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="find_account">
-      <corba:operation name="find_account">
-        <corba:param mode="inout" name="account_details" idltype="corba:any" />
-      </corba:operation>
-      <wsdl:input name="find_accountRequest">
-      </wsdl:input>
-      <wsdl:output name="find_accountResponse">
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="remove_account">
-      <corba:operation name="remove_account">
-        <corba:param mode="in" name="account_name" idltype="corba:string" />
-      </corba:operation>
-      <wsdl:input name="remove_accountRequest">
-      </wsdl:input>
-      <wsdl:output name="remove_accountResponse">
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="AccountCORBABinding" type="tns:Account">
-    <corba:binding repositoryID="IDL:Account:1.0" />
-    <wsdl:operation name="get_balance">
-      <corba:operation name="get_balance">
-        <corba:return name="return" idltype="corba:float" />
-      </corba:operation>
-      <wsdl:input name="get_balanceRequest">
-      </wsdl:input>
-      <wsdl:output name="get_balanceResponse">
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="deposit">
-      <corba:operation name="deposit">
-        <corba:param mode="in" name="addition" idltype="corba:float" />
-      </corba:operation>
-      <wsdl:input name="depositRequest">
-      </wsdl:input>
-      <wsdl:output name="depositResponse">
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="AccountCORBAService">
-    <wsdl:port name="AccountCORBAPort" binding="tns:AccountCORBABinding">
-      <corba:address location="corbaloc::localhost:60000/Account" />
-    </wsdl:port>
-  </wsdl:service>
-  <wsdl:service name="BankCORBAService">
-    <wsdl:port name="BankCORBAPort" binding="tns:BankCORBABinding">
-      <corba:address location="corbaloc::localhost:40000/Bank" />
-      <corba:policy poaname="Bank" serviceid="Bank" persistent="true" />
-    </wsdl:port>
-  </wsdl:service>
+<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/Bank" xmlns:tns="http://schemas.apache.org/yoko/idl/Bank" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:corba="http://cxf.apache.org/bindings/corba" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+    <corba:typeMapping targetNamespace="http://schemas.apache.org/yoko/idl/Bank/typemap">
+        <corba:object xmlns:ns4="http://www.w3.org/2005/08/addressing" xmlns="http://schemas.apache.org/yoko/idl/Bank" binding="AccountCORBABinding" repositoryID="IDL:Account:1.0" type="ns4:EndpointReferenceType" name="Account" />
+        <corba:object xmlns="http://www.w3.org/2005/08/addressing" repositoryID="IDL:omg.org/CORBA/Object/1.0" type="EndpointReferenceType" name="CORBA.Object" />
+    </corba:typeMapping>
+    <wsdl:types>
+        <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://schemas.apache.org/yoko/idl/Bank" xmlns="http://schemas.apache.org/yoko/idl/Bank" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd">
+            </xs:import>
+            <xs:element name="get_balance">
+                <xs:complexType>
+                    <xs:sequence>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="get_balanceResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="return" type="xs:float">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="deposit">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="addition" type="xs:float">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="depositResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="create_account">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="account_name" type="xs:string">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="create_accountResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="return" nillable="true" type="wsa:EndpointReferenceType">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="AccountRef" type="wsa:EndpointReferenceType">
+                <xs:annotation>
+                    <xs:appinfo>
+                    </xs:appinfo>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="create_epr_account">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="account_name" type="xs:string">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="create_epr_accountResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="return" nillable="true" type="wsa:EndpointReferenceType">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="get_account">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="account_name" type="xs:string">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="get_accountResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="return" nillable="true" type="wsa:EndpointReferenceType">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="get_epr_account">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="account_name" type="xs:string">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="get_epr_accountResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="return" nillable="true" type="wsa:EndpointReferenceType">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="get_account_epr_with_no_use_attribute">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="account_name" type="xs:string">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="get_account_epr_with_no_use_attributeResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="return" nillable="true" type="wsa:EndpointReferenceType">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="find_account">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="account_details" type="xs:anyType">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="find_accountResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="account_details" type="xs:anyType">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="remove_account">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="account_name" type="xs:string">
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="remove_accountResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:schema>
+    </wsdl:types>
+    <wsdl:message name="remove_account">
+        <wsdl:part name="inparameter" element="tns:remove_account">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="create_epr_accountResponse">
+        <wsdl:part name="outparameter" element="tns:create_epr_accountResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="get_account">
+        <wsdl:part name="inparameter" element="tns:get_account">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="get_epr_accountResponse">
+        <wsdl:part name="outparameter" element="tns:get_epr_accountResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="get_balanceResponse">
+        <wsdl:part name="outparameter" element="tns:get_balanceResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="get_epr_account">
+        <wsdl:part name="inparameter" element="tns:get_epr_account">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="get_accountResponse">
+        <wsdl:part name="outparameter" element="tns:get_accountResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="get_balance">
+        <wsdl:part name="inparameter" element="tns:get_balance">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="create_account">
+        <wsdl:part name="inparameter" element="tns:create_account">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="remove_accountResponse">
+        <wsdl:part name="outparameter" element="tns:remove_accountResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="deposit">
+        <wsdl:part name="inparameter" element="tns:deposit">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="create_accountResponse">
+        <wsdl:part name="outparameter" element="tns:create_accountResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="find_accountResponse">
+        <wsdl:part name="outparameter" element="tns:find_accountResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="get_account_epr_with_no_use_attributeResponse">
+        <wsdl:part name="outparameter" element="tns:get_account_epr_with_no_use_attributeResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="find_account">
+        <wsdl:part name="inparameter" element="tns:find_account">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="create_epr_account">
+        <wsdl:part name="inparameter" element="tns:create_epr_account">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="get_account_epr_with_no_use_attribute">
+        <wsdl:part name="inparameter" element="tns:get_account_epr_with_no_use_attribute">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="depositResponse">
+        <wsdl:part name="outparameter" element="tns:depositResponse">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="Bank">
+        <wsdl:operation name="create_account">
+            <wsdl:input name="create_accountRequest" message="tns:create_account">
+            </wsdl:input>
+            <wsdl:output name="create_accountResponse" message="tns:create_accountResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="create_epr_account">
+            <wsdl:input name="create_epr_accountRequest" message="tns:create_epr_account">
+            </wsdl:input>
+            <wsdl:output name="create_epr_accountResponse" message="tns:create_epr_accountResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="get_account">
+            <wsdl:input name="get_accountRequest" message="tns:get_account">
+            </wsdl:input>
+            <wsdl:output name="get_accountResponse" message="tns:get_accountResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="get_epr_account">
+            <wsdl:input name="get_epr_accountRequest" message="tns:get_epr_account">
+            </wsdl:input>
+            <wsdl:output name="get_epr_accountResponse" message="tns:get_epr_accountResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="get_account_epr_with_no_use_attribute">
+            <wsdl:input name="get_account_epr_with_no_use_attributeRequest" message="tns:get_account_epr_with_no_use_attribute">
+            </wsdl:input>
+            <wsdl:output name="get_account_epr_with_no_use_attributeResponse" message="tns:get_account_epr_with_no_use_attributeResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="find_account">
+            <wsdl:input name="find_accountRequest" message="tns:find_account">
+            </wsdl:input>
+            <wsdl:output name="find_accountResponse" message="tns:find_accountResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="remove_account">
+            <wsdl:input name="remove_accountRequest" message="tns:remove_account">
+            </wsdl:input>
+            <wsdl:output name="remove_accountResponse" message="tns:remove_accountResponse">
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:portType name="Account">
+        <wsdl:operation name="get_balance">
+            <wsdl:input name="get_balanceRequest" message="tns:get_balance">
+            </wsdl:input>
+            <wsdl:output name="get_balanceResponse" message="tns:get_balanceResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="deposit">
+            <wsdl:input name="depositRequest" message="tns:deposit">
+            </wsdl:input>
+            <wsdl:output name="depositResponse" message="tns:depositResponse">
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="BankCORBABinding" type="tns:Bank">
+        <corba:binding repositoryID="IDL:Bank:1.0" />
+        <wsdl:operation name="create_account">
+            <corba:operation name="create_account">
+                <corba:param mode="in" name="account_name" idltype="corba:string" />
+                <corba:return xmlns="http://schemas.apache.org/yoko/idl/Bank/typemap" name="return" idltype="Account" />
+            </corba:operation>
+            <wsdl:input name="create_accountRequest">
+            </wsdl:input>
+            <wsdl:output name="create_accountResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="create_epr_account">
+            <corba:operation name="create_epr_account">
+                <corba:param mode="in" name="account_name" idltype="corba:string" />
+                <corba:return xmlns="http://schemas.apache.org/yoko/idl/Bank/typemap" name="return" idltype="CORBA.Object" />
+            </corba:operation>
+            <wsdl:input name="create_epr_accountRequest">
+            </wsdl:input>
+            <wsdl:output name="create_epr_accountResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="get_account">
+            <corba:operation name="get_account">
+                <corba:param mode="in" name="account_name" idltype="corba:string" />
+                <corba:return xmlns="http://schemas.apache.org/yoko/idl/Bank/typemap" name="return" idltype="Account" />
+            </corba:operation>
+            <wsdl:input name="get_accountRequest">
+            </wsdl:input>
+            <wsdl:output name="get_accountResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="get_epr_account">
+            <corba:operation name="get_epr_account">
+                <corba:param mode="in" name="account_name" idltype="corba:string" />
+                <corba:return xmlns="http://schemas.apache.org/yoko/idl/Bank/typemap" name="return" idltype="CORBA.Object" />
+            </corba:operation>
+            <wsdl:input name="get_epr_accountRequest">
+            </wsdl:input>
+            <wsdl:output name="get_epr_accountResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="get_account_epr_with_no_use_attribute">
+            <corba:operation name="get_account_epr_with_no_use_attribute">
+                <corba:param mode="in" name="account_name" idltype="corba:string" />
+                <corba:return xmlns="http://schemas.apache.org/yoko/idl/Bank/typemap" name="return" idltype="CORBA.Object" />
+            </corba:operation>
+            <wsdl:input name="get_account_epr_with_no_use_attributeRequest">
+            </wsdl:input>
+            <wsdl:output name="get_account_epr_with_no_use_attributeResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="find_account">
+            <corba:operation name="find_account">
+                <corba:param mode="inout" name="account_details" idltype="corba:any" />
+            </corba:operation>
+            <wsdl:input name="find_accountRequest">
+            </wsdl:input>
+            <wsdl:output name="find_accountResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="remove_account">
+            <corba:operation name="remove_account">
+                <corba:param mode="in" name="account_name" idltype="corba:string" />
+            </corba:operation>
+            <wsdl:input name="remove_accountRequest">
+            </wsdl:input>
+            <wsdl:output name="remove_accountResponse">
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:binding name="AccountCORBABinding" type="tns:Account">
+        <corba:binding repositoryID="IDL:Account:1.0" />
+        <wsdl:operation name="get_balance">
+            <corba:operation name="get_balance">
+                <corba:return name="return" idltype="corba:float" />
+            </corba:operation>
+            <wsdl:input name="get_balanceRequest">
+            </wsdl:input>
+            <wsdl:output name="get_balanceResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="deposit">
+            <corba:operation name="deposit">
+                <corba:param mode="in" name="addition" idltype="corba:float" />
+            </corba:operation>
+            <wsdl:input name="depositRequest">
+            </wsdl:input>
+            <wsdl:output name="depositResponse">
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="AccountCORBAService">
+        <wsdl:port name="AccountCORBAPort" binding="tns:AccountCORBABinding">
+            <corba:address location="corbaname::localhost:1050#Account" />
+        </wsdl:port>
+    </wsdl:service>
+    <wsdl:service name="BankCORBAService">
+        <wsdl:port name="BankCORBAPort" binding="tns:BankCORBABinding">
+            <corba:address location="corbaname::localhost:1050#Bank" />
+            <corba:policy poaname="Bank" serviceid="Bank" persistent="true" />
+        </wsdl:port>
+    </wsdl:service>
 </wsdl:definitions>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/README.txt?rev=636910&r1=636829&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/README.txt Thu Mar 13 15:51:39 2008
@@ -1,181 +1,69 @@
-Bank Object Reference Demo
-==========================
+Bank CORBA Demo
+===============
 
-Prerequisites
-=============
+This demo illustrates the use of the JAX-WS APIs to run a simple
+"Bank" application using CORBA/IIOP instead of SOAP/XML.  It
+also contains standard CORBA client/server applications using 
+pure CORBA code so you can can see the JAX-WS client hit a pure
+CORBA server and a pure CORBA client hit the JAX-WS server.
 
-If your environment already includes yoko-${current-yoko-version}.jar on the
-CLASSPATH, and the JDK and ant bin directories on the PATH
-it is not necessary to run the environment script described in
-the samples directory README.  If your environment is not
-properly configured, or if you are planning on using wsdl2idl/idl2wsdl,
-javac, and java to build and run the demos, you must include the 
-yoko-${current-yoko-version}.jar in the CLASSPATH. Also set 
-YOKO_HOME to the installation directory.
-
-Demo Use Cases
-==============
-
-This demo allows the user to run three use cases.
-
-- Case 1: Web services client & Web services server.
-
-  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 CXF Web services framework and the IIOP protocol is enabled by installing
-the Yoko CORBA binding into CXF.
-
-  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 CXF, loads the
-Yoko CORBA binding to enable the IIOP protocol. The server is implemented using
-the Yoko ORB.
-
-This use case illustrates how a Web services client can be configured to access
-a CORBA server, by converting the server's OMG IDL interface into a WSDL interface
-with a CORBA binding.
-
-- Case 3: CORBA client & Web services server.
-
-  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 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
-using the IIOP protocol.
-
-
-Building the Demo
-=================
-
-To build the demo code, perform the following steps:
-
-1. Open a command prompt and move into the directory <YOKO_HOME>/samples/ws/bank_ws_addressing
-
-2. From the samples/ws/bank_ws_addressing directory, enter the following command (UNIX or Windows):
-
-     ant build
-
-  This command uses the CXF wsdl2java utility to generate the server & client code.
-
-
-Running the Demo - Use Case 1
-=============================
-
-To run the demo for the first use case, perform the following steps:
-
-1. Open a command prompt and move into the directory <YOKO_HOME>/samples/ws/bank_ws_addressing.
-
-2. Enter the following command to start the server (on a single command line):
-
-   UNIX (must use forward slashes):
+The Account objects returned from this sample are references to 
+Accounts on the server.  
 
-     java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-SNAPSHOT.jar 
-        -classpath $CLASSPATH:build/classes yoko.server.Server &
 
-   Windows (may use either forward or back slashes):
+Prerequisite
+------------
 
-     start java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-SNAPSHOT.jar 
-        -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 client:
-
-   UNIX:
-
-     java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-SNAPSHOT.jar 
-        -classpath $CLASSPATH:build/classes yoko.client.Client
-
-   Windows:
-
-     java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-SNAPSHOT.jar
-        -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_ws_addressing
-
-2. Enter the following command to start the CORBA server (on a single command line):
-
-   UNIX (must use forward slashes):
-
-     java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-SNAPSHOT.jar 
-        -classpath $CLASSPATH:build/classes corba.server.Server &
-
-   Windows (may use either forward or back slashes):
-
-     start java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-SNAPSHOT.jar 
-        -classpath %CLASSPATH%;build\classes corba.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 Web services client:
-
-   UNIX:
-
-     java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-SNAPSHOT.jar 
-        -classpath $CLASSPATH:build/classes yoko.client.Client
-
-   Windows:
-
-     java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-SNAPSHOT.jar
-        -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).
+If your environment already includes cxf-manifest-incubator.jar on the
+CLASSPATH, and the JDK and ant bin directories on the PATH
+it is not necessary to set the environment as described in
+the samples directory README.  If your environment is not
+properly configured, or if you are planning on using wsdl2java,
+javac, and java to build and run the demos, you must set the
+environment.
 
 
-Running the Demo - Use Case 3
-=============================
 
-To run the demo for the third use case, perform the following steps:
+Building and running the demo using Ant
+---------------------------------------
+From the base directory of this sample (i.e., where this README file is
+located), the Ant build.xml file can be used to build and run the demo. 
+The server and client targets automatically build the demo.
 
-1. Open a command prompt and move into the directory <YOKO_HOME>/samples/ws/bank_ws_addressing
+First, if using the Sun ORB built into the JDK, you need to start the orbd
+nameing service.   From a command prompt, run:
 
-2. Enter the following command to start the Web services server (on a single command line):
+  orbd -ORBInitialPort 1050 -serverPollingTime 200
 
-   UNIX (must use forward slashes):
+Other ORB's may have different requirements.
 
-     java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-SNAPSHOT.jar 
-        -classpath $CLASSPATH:build/classes yoko.server.Server &
 
-   Windows (may use either forward or back slashes):
+Use Case 1 - Pure CORBA Server, CXF/JAX-WS Client
+-------------------------------------------------
+Start the pure CORBA server by running
+  ant corba.server
 
-     start java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-SNAPSHOT.jar 
-        -classpath %CLASSPATH%;build\classes yoko.server.Server
+Run the JAX-WS client by running:
+  ant cxf.client
 
-  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 CORBA client:
+Use Case 2 - CXF/JAX-WS Server, Pure CORBA Client
+-------------------------------------------------
+Start the CXF/JAX-WS server by running
+  ant cxf.server
 
-   UNIX:
+Run the pure CORBA client by running:
+  ant corba.client
 
-     java -Xbootclasspath/p:$YOKO_HOME/lib/yoko-spec-corba-1.0-incubating-SNAPSHOT.jar:$YOKO_HOME/lib/yoko-core-1.0-incubating-SNAPSHOT.jar 
-        -classpath $CLASSPATH:build/classes corba.client.Client
 
-   Windows:
+Use Case 3 - CXF/JAX-WS Server, CXF/JAX-WS Client
+-------------------------------------------------
+Start the CXF/JAX-WS server by running
+  ant cxf.server
 
-     java -Xbootclasspath/p:%YOKO_HOME%\lib\yoko-spec-corba-1.0-incubating-SNAPSHOT.jar;%YOKO_HOME%\lib\yoko-core-1.0-incubating-SNAPSHOT.jar
-        -classpath %CLASSPATH%;build\classes corba.client.Client
+Run the CXF/JAX-WS client by running:
+  ant cxf.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).
 
 
 Cleanup
@@ -185,3 +73,4 @@
 files, either delete the build directory and its contents or run:
 
   ant clean
+

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/build.xml?rev=636910&r1=636829&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/build.xml Thu Mar 13 15:51:39 2008
@@ -19,38 +19,13 @@
 -->
 <project name="Bank Object Reference Demo" default="build" basedir=".">
 
-    <property environment="env"/>
-    <property name="build.dir" location="${basedir}/build"/>
-    <property name="build.src.dir" location="${basedir}/build/src"/>
-    <property name="build.classes.dir" location="${build.dir}/classes"/>
-
-    <!-- Determine yoko.home, either from the environment varialble YOKO_HOME
-       - or using ../../..
-       -->
-    <condition property="yoko.home" value="${env.YOKO_HOME}">
-        <isset property="env.YOKO_HOME"/>
-    </condition>
-    <property name="yoko.home" location="../../.."/>
-
-    <path id="yoko.classpath">
-        <pathelement location="${build.classes.dir}"/>
-        <pathelement location="${yoko.home}/lib/yoko-1.0-incubating-SNAPSHOT.jar"/>
-    </path>
-
-    <target name="build"> 
-        <!--<antcall target="generate.corba.wsdl"/>-->
-        <antcall target="generate.yoko.server.code"/>
-        <antcall target="generate.yoko.client.code"/>
-        <antcall target="generate.corba.server.code"/>
-        <antcall target="generate.corba.client.code"/>
-        <javac destdir="${build.classes.dir}" debug="true">
-            <src path="${basedir}/src"/>
-            <src path="${build.src.dir}"/>
-            <classpath>
-                <path refid="yoko.classpath"/>
-                <pathelement path="${thirdparty.classpath}"/>
-            </classpath>
-        </javac>
+    <property name="wsdl.dir" location="${basedir}/../resources"/>
+    <import file="../../common_build.xml"/>     
+
+    <target name="generate.code">
+        <!--antcall target="generate.corba.wsdl"/-->
+        <antcall target="generate.ws.code"/>
+        <antcall target="generate.corba.code"/>
     </target>
 
     <target name="generate.corba.wsdl">
@@ -62,43 +37,51 @@
         <delete file="BankWS-account.wsdl"/>
     </target>
     
-    <target name="generate.yoko.server.code">
-        <echo level="info" message="Generating server code using wsdl2java..."/>
-        <wsdl2java file="BankWS-corba.wsdl" package="yoko.server"/>
+    <target name="generate.ws.code">
+        <echo level="info" message="Generating ws code using wsdl2java..."/>
+        <wsdl2java dir="${basedir}" file="BankWS-corba.wsdl" package="yoko.common"/>
     </target>
 
-    <target name="generate.corba.server.code">
-        <echo level="info" message="Generating server code using idlj..."/>
-        <idl2java file="BankWS-corba.idl" package="corba.server"/>
+    <target name="generate.corba.code">
+        <echo level="info" message="Generating corba code using idlj..."/>
+        <idl2java file="BankWS-corba.idl" package="corba.common"/>
     </target>
 
-    <target name="generate.yoko.client.code">
-        <echo level="info" message="Generating client code using wsdl2java..."/>
-        <wsdl2java file="BankWS-corba.wsdl" package="yoko.client"/>
+
+    <target name="cxf.client" depends="build">
+        <cxfrun classname="yoko.client.Client"/>
+    </target>
+    <target name="corba.client" depends="build">
+        <java classname="corba.client.Client" fork="yes">
+            <classpath>
+                <pathelement path="build/classes"/>
+                <path refid="jdk.tools.classpath"/>
+            </classpath>
+        </java>
     </target>
 
-    <target name="generate.corba.client.code">
-        <echo level="info" message="Generating client code using idlj..."/>
-        <idl2java file="BankWS-corba.idl" package="corba.client"/>
+    <target name="cxf.server" depends="build">
+        <cxfrun classname="yoko.server.Server"/>
     </target>
 
-    <target name="clean">
-        <delete dir="${build.classes.dir}"/>
-        <delete dir="${build.src.dir}"/>
-        <delete dir="${build.dir}"/>
-        <delete file="endpoint.ior"/>
+    <target name="corba.server" depends="build">
+        <java classname="corba.server.Server" fork="yes">
+            <classpath>
+                <pathelement path="build/classes"/>
+                <path refid="jdk.tools.classpath"/>
+            </classpath>
+        </java>
     </target>
 
     <macrodef name="wsdl2corba">
         <attribute name="file"/>
-        <attribute name="dest"/>
-        <attribute name="binding"/>
+        <attribute name="extraArgs" default=""/>
         <sequential>
-            <java failonerror="true" classname="org.apache.yoko.tools.WSDLToIDL" fork="yes">
+            <java failonerror="true" classname="org.apache.cxf.tools.corba.WSDLToIDL" fork="yes">
                 <classpath>
-                    <path refid="yoko.classpath"/>
+                    <path refid="cxf.classpath" />
                 </classpath>
-                <arg line="-d ${basedir} -corba -i @{binding} -o @{dest} @{file}"/>
+                <arg line="@{extraArgs} -d ${build.dir} -corba @{file}"/>
             </java>
         </sequential>
     </macrodef>
@@ -108,26 +91,11 @@
         <attribute name="dest"/>
         <attribute name="binding"/>
         <sequential>
-            <java failonerror="true" classname="org.apache.yoko.tools.WSDLToIDL" fork="yes">
+            <java failonerror="true" classname="org.apache.cxf.tools.corba.WSDLToIDL" fork="yes">
                 <classpath>
-                    <path refid="yoko.classpath"/>
+                    <path refid="cxf.classpath"/>
                 </classpath>
                 <arg line="-d ${basedir} -idl -i @{binding} -o @{dest} @{file}"/>
-            </java>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="wsdl2java">
-        <attribute name="srcdestdir" default="${build.src.dir}"/>
-        <attribute name="destdir" default="${build.classes.dir}"/>
-        <attribute name="file"/>
-        <attribute name="package"/>
-        <sequential>
-            <mkdir dir="@{srcdestdir}"/>
-            <mkdir dir="@{destdir}"/>
-            <java failonerror="true" 
-                  classname="org.apache.cxf.tools.wsdlto.WSDLToJava">
-                <arg line="-p @{package} -d @{srcdestdir} @{file}"/>
             </java>
         </sequential>
     </macrodef>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java?rev=636910&r1=636829&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/client/Client.java Thu Mar 13 15:51:39 2008
@@ -24,20 +24,23 @@
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.UserException;
 
+import corba.common.Bank;
+import corba.common.BankHelper;
+import corba.common.Account;
+import corba.common.AccountHelper;
+
 public class Client {
     static int run(ORB orb, String[] args) throws UserException {
         
         // Get the Bank object
         org.omg.CORBA.Object obj = 
-            orb.string_to_object("corbaloc::localhost:40000/Bank");
+            orb.string_to_object("corbaname::localhost:1050#Bank");
         if (obj == null) {
-            System.err.println("bank.Client: cannot read IOR from Bank.ref");
+            System.err.println("bank.Client: cannot read IOR from corbaname::localhost:1050#Bank");
             return 1;
         }
         Bank bank = BankHelper.narrow(obj);
 
-        // Call each of the bank methods once to test the functionality.
-        //bank.addAccount(account);
 
         // Test the method Bank.create_account()
         System.out.println("Creating account called \"Account1\"");
@@ -93,10 +96,6 @@
         ORB orb = null;
 
         Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass",
-                  "org.apache.yoko.orb.CORBA.ORBSingleton");
-        props.put("ooc.orb.id", "Bank-Client");
 
         try {
             orb = ORB.init(args, props);

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Account_impl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Account_impl.java?rev=636910&r1=636829&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Account_impl.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Account_impl.java Thu Mar 13 15:51:39 2008
@@ -21,6 +21,9 @@
 
 import org.omg.PortableServer.POA;
 
+import corba.common.AccountPOA;
+
+
 public class Account_impl extends AccountPOA {
     
     // The servants default POA

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Bank_impl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Bank_impl.java?rev=636910&r1=636829&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Bank_impl.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Bank_impl.java Thu Mar 13 15:51:39 2008
@@ -25,25 +25,40 @@
 import org.omg.CORBA.ORB;
 import org.omg.PortableServer.POA;
 
+import corba.common.Account;
+import corba.common.AccountHelper;
+import corba.common.BankPOA;
 public class Bank_impl extends BankPOA {
     
-    private ORB orb_;
     private POA poa_;
 
     private Map<String, Account> accountList;
     
-    Bank_impl(ORB orb, POA poa) {
-        orb_ = orb;
+    Bank_impl(POA poa) {
         poa_ = poa;
 
         accountList = new HashMap<String, Account>();
     }
 
     public Account create_account(String account_name) {
+        if (accountList.containsKey(account_name)) {
+            return accountList.get(account_name);
+        }
+        
         System.out.println("[Bank] Called create_account( " + account_name + " )...");
-        System.out.println();
+        System.out.println();        
         Account_impl accountImpl = new Account_impl(poa_);
-        Account account = accountImpl._this(orb_);
+        String name = "Account-" + account_name;
+        byte[] oid = name.getBytes();       
+        try {
+            poa_.activate_object_with_id(oid, accountImpl);
+        } catch (Exception ex) {
+            //Ignore
+        }
+
+        org.omg.CORBA.Object obj = poa_.create_reference_with_id(oid, AccountHelper.id());
+        Account account = AccountHelper.narrow(obj);
+
         accountList.put(account_name, account);
         return account;
     }
@@ -51,8 +66,22 @@
     public org.omg.CORBA.Object create_epr_account(String account_name) {
         System.out.println("[Bank] Called create_epr_account( " + account_name + ")...");
         System.out.println();
-        Account_impl accountImpl = new Account_impl(poa_);
+        /*Account_impl accountImpl = new Account_impl(poa_);
         Account account = accountImpl._this(orb_);
+        accountList.put(account_name, account);*/
+
+        Account_impl accountImpl = new Account_impl(poa_);
+        String name = "Account-" + account_name;
+        byte[] oid = name.getBytes();       
+        try {
+            poa_.activate_object_with_id(oid, accountImpl);
+        } catch (Exception ex) {
+            //Ignore
+        }
+
+        org.omg.CORBA.Object obj = poa_.create_reference_with_id(oid, AccountHelper.id());
+        Account account = AccountHelper.narrow(obj);
+
         accountList.put(account_name, account);
         return account;
     }
@@ -92,3 +121,4 @@
         return poa_;
     }
 }
+

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java?rev=636910&r1=636829&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/corba/server/Server.java Thu Mar 13 15:51:39 2008
@@ -23,14 +23,14 @@
 
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.UserException;
-import org.omg.CORBA.ORBPackage.InvalidName;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContextExt;
+import org.omg.CosNaming.NamingContextExtHelper;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.POAHelper;
 import org.omg.PortableServer.POAManager;
 
-import org.apache.yoko.orb.OB.BootManager;
-import org.apache.yoko.orb.OB.BootManagerHelper;
-import org.apache.yoko.orb.OB.BootManagerPackage.AlreadyExists;
+import corba.common.BankHelper;
 
 public class Server
 {
@@ -40,35 +40,34 @@
         //
         // Resolve Root POA
         //
-        POA rootPOA = POAHelper.narrow(orb.resolve_initial_references("RootPOA"));
+        POA poa = POAHelper.narrow(orb.resolve_initial_references("RootPOA"));
 
         //
         // Get a reference to the POA manager
         //
-        POAManager manager = rootPOA.the_POAManager();
+        POAManager manager = poa.the_POAManager();
 
         //
         // Create implementation object
         //
-        Bank_impl bankImpl = new Bank_impl(orb, rootPOA);
-        Bank bank = bankImpl._this(orb);
+        Bank_impl bankImpl = new Bank_impl(poa);
+
+        byte[] oid = "Bank".getBytes();
+        poa.activate_object_with_id(oid, bankImpl);
+
+        org.omg.CORBA.Object ref = poa.create_reference_with_id(oid, BankHelper.id());
+
+        // Register in NameService
+        org.omg.CORBA.Object nsObj = orb.resolve_initial_references("NameService");
+        NamingContextExt rootContext = NamingContextExtHelper.narrow(nsObj);
+        NameComponent[] nc = rootContext.to_name("Bank");
+        rootContext.rebind(nc, ref);
 
-        // Add reference to the boot manager
-        try {
-            byte[] oid = ("Bank").getBytes();
-            BootManager bootManager = BootManagerHelper.narrow(
-                orb.resolve_initial_references("BootManager"));
-            bootManager.add_binding(oid, bank);
-        } catch (InvalidName ex) {
-            throw new RuntimeException();
-        } catch (AlreadyExists ex) {
-            throw new RuntimeException();
-        }
-        
         //
         // Run implementation
         //
         manager.activate();
+        System.out.println("Server ready...");
         orb.run();
 
         return 0;
@@ -78,17 +77,11 @@
     main(String args[])
     {
         Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass",
-                  "org.apache.yoko.orb.CORBA.ORBSingleton");
-        props.put("yoko.orb.id", "Bank-Server");
-        // for this demo, start on localhost, port 40000
-        props.put("yoko.orb.oa.endpoint", "iiop --host localhost --port 40000");
-                
+        props.put("org.omg.CORBA.ORBInitialHost", "localhost");
+        props.put("org.omg.CORBA.ORBInitialPort", "1050");                
 
         int status = 0;
         ORB orb = null;
-
         try
         {
             orb = ORB.init(args, props);

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/client/Client.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/client/Client.java?rev=636910&r1=636829&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/client/Client.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/client/Client.java Thu Mar 13 15:51:39 2008
@@ -28,20 +28,18 @@
 import javax.xml.namespace.QName;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Service;
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
 
-import org.apache.cxf.jaxb.JAXBUtils;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
-import org.apache.cxf.wsdl.WSDLManager;
-import org.apache.cxf.wsdl11.WSDLManagerImpl;
+import yoko.common.Account;
+import yoko.common.AccountCORBAService;
+import yoko.common.Bank;
+import yoko.common.BankCORBAService;
 
 public final class Client {
 
     private static final Logger LOG =
         Logger.getLogger(Client.class.getPackage().getName());
 
-    private static final QName SERVICE_NAME 
-        = new QName("http://schemas.apache.org/yoko/idl/Bank", "BankCORBAService");
     
     private Client() {
     }
@@ -49,13 +47,12 @@
     public static void main(String args[]) throws Exception {
         
         LOG.log(Level.INFO, "Resolving the bank object");
-        URL wsdlUrl = new URL("file:./BankWS-corba.wsdl");
-        BankCORBAService service = new BankCORBAService(wsdlUrl, SERVICE_NAME);
+        BankCORBAService service = new BankCORBAService();
         Bank port = service.getBankCORBAPort();
 
         // Test the method Bank.createAccount()
         System.out.println("Creating account called \"Account1\"");
-        EndpointReferenceType epr1 = port.createAccount("Account1");
+        W3CEndpointReference epr1 = port.createAccount("Account1");
         Account account1 = getAccountFromEPR(epr1);
         System.out.println("Depositing 100.00 into account \'Account1\"");
         account1.deposit(100.00f);
@@ -66,7 +63,7 @@
            within the EPR. 
         // Test the method Bank.createEprAccount()
         System.out.println("Creating account called \"Account2\"");
-        EndpointReferenceType epr2 = port.createEprAccount("Account2");
+        W3CEndpointReference epr2 = port.createEprAccount("Account2");
         Account account2 = getAccountFromEPR(epr2);
         System.out.println("Depositing 5.00 into account \'Account2\"");
         account2.deposit(5.00f);
@@ -82,7 +79,7 @@
         
         // Test the method Bank.getAccount()
         System.out.println("Retrieving account called \"Account3\"");
-        EndpointReferenceType epr3 = port.getAccount("Account3");
+        W3CEndpointReference epr3 = port.getAccount("Account3");
         Account account3 = getAccountFromEPR(epr3);
         System.out.println("Current balance for \"Account3\" is " + account3.getBalance());
         System.out.println("Depositing 10.00 into account \"Account3\"");
@@ -110,50 +107,8 @@
         System.exit(0);
     }
 
-    private static Account getAccountFromEPR(EndpointReferenceType epr) {
-
-        WSDLManager manager = null;
-        try {
-            manager = new WSDLManagerImpl();
-        } catch (Exception ex) {
-            LOG.log(Level.SEVERE, "Unable to create WSDLManager");
-            System.exit(1);
-        }
-
-        QName interfaceName = EndpointReferenceUtils.getInterfaceName(epr);
-        String wsdlLocation = EndpointReferenceUtils.getWSDLLocation(epr);
-        QName serviceName = EndpointReferenceUtils.getServiceName(epr);
-        String portName = EndpointReferenceUtils.getPortName(epr);
-
-        QName port = new QName(serviceName.getNamespaceURI(), portName);
-
-        StringBuffer seiName = new StringBuffer();
-        seiName.append("yoko.client.");
-        seiName.append(JAXBUtils.nameToIdentifier(interfaceName.getLocalPart(),
-                                                  JAXBUtils.IdentifierType.INTERFACE));
-
-        Class<?> sei = null;
-        try {
-            sei = Class.forName(seiName.toString(), true, manager.getClass().getClassLoader());
-        } catch (ClassNotFoundException ex) {
-            LOG.log(Level.SEVERE, "Unable to obtain SEI class");
-            System.exit(1);
-        }
-
-        URL wsdlURL = null;
-        try {
-            wsdlURL = new URL(wsdlLocation);
-        } catch (Exception ex) {
-            LOG.log(Level.SEVERE, "Unable to create URL for WSDL");
-            System.exit(1);
-        }
-
-        Service service = Service.create(wsdlURL, serviceName);
-        Account account = (Account)service.getPort(port, sei);
-
-        Map<String, Object> requestContext = ((BindingProvider)account).getRequestContext();
-        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, epr.getAddress().getValue());
-
-        return account;
+    private static Account getAccountFromEPR(W3CEndpointReference epr) {
+        AccountCORBAService service = new AccountCORBAService();
+        return service.getPort(epr, Account.class);
     }
 }

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/AccountImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/AccountImpl.java?rev=636910&r1=636829&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/AccountImpl.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/AccountImpl.java Thu Mar 13 15:51:39 2008
@@ -19,11 +19,14 @@
 
 package yoko.server;
 
+import yoko.common.Account;
+
 @javax.jws.WebService(portName = "AccountCORBAPort",
                       serviceName = "AccountCORBAService",
                       targetNamespace = "http://schemas.apache.org/yoko/idl/Bank",
-                      wsdlLocation = "file:./BankWS-corba.wsdl",
-                      endpointInterface = "yoko.server.Account")
+                      //wsdlLocation = "file:./BankWS-corba.wsdl",
+                      wsdlLocation = "file:/home/dkulp/working/cxf/distribution/src/main/release/samples/corba/bank_ws_addressing/BankWS-corba.wsdl",
+                      endpointInterface = "yoko.common.Account")
 
 public class AccountImpl implements Account {
     

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/BankImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/BankImpl.java?rev=636910&r1=636829&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/BankImpl.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/BankImpl.java Thu Mar 13 15:51:39 2008
@@ -29,53 +29,31 @@
 import javax.xml.namespace.QName;
 import javax.xml.ws.Endpoint;
 import javax.xml.ws.Service;
+import javax.xml.ws.wsaddressing.W3CEndpointReference;
 
-import org.apache.cxf.jaxb.JAXBUtils;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
-import org.apache.cxf.wsdl.WSDLManager;
-import org.apache.cxf.wsdl11.WSDLManagerImpl;
+import yoko.common.Bank;
+import yoko.common.Account;
 
 @javax.jws.WebService(portName = "BankCORBAPort", 
                       serviceName = "BankCORBAService",
                       targetNamespace = "http://schemas.apache.org/yoko/idl/Bank",
-                      wsdlLocation = "file:./BankWS-corba.wsdl",
-                      endpointInterface = "yoko.server.Bank")
+                      //wsdlLocation = "file:./BankWS-corba.wsdl",
+                      wsdlLocation = "file:/home/dkulp/working/cxf/distribution/src/main/release/samples/corba/bank_ws_addressing/BankWS-corba.wsdl",
+                      endpointInterface = "yoko.common.Bank")
 
 public class BankImpl implements Bank {
 
-    private static final QName ACCOUNT_SERVICE_NAME
-        = new QName("http://schemas.apache.org/yoko/idl/Bank", "AccountCORBAService");
- 
-    private static final QName ACCOUNT_PORT_NAME
-        = new QName("http://schemas.apache.org/yoko/idl/Bank", "AccountCORBAPort");
-
-    private static final QName ACCOUNT_PORT_TYPE
-        = new QName("http://schemas.apache.org/yoko/idl/Bank", "Account");
-
-    private URL wsdlURL;
-    private Map<String, EndpointReferenceType> accountList = 
-        new HashMap<String, EndpointReferenceType>();
+    private Map<String, W3CEndpointReference> accountList = 
+        new HashMap<String, W3CEndpointReference>();
     private Map<String, Endpoint> endpointList = new HashMap<String, Endpoint>();
 
-    public BankImpl(String wsdlLocation) {
-        try {
-            File wsdlFile = new File(wsdlLocation);
-            if (wsdlFile.exists()) {
-                wsdlURL = wsdlFile.toURL();
-            } else {
-                wsdlURL = new URL(wsdlLocation);
-            }
-        } catch (Exception ex) {
-            System.out.println("Unable to resolve WSDL location");
-            System.exit(1);
-        }
+    public BankImpl() {
     }
     
-    public EndpointReferenceType createAccount(String accountName) {
+    public W3CEndpointReference createAccount(String accountName) {
         System.out.println("[Bank] Called createAccount( " + accountName + " )...");
         System.out.println();
-        EndpointReferenceType ref = null;
+        W3CEndpointReference ref = null;
         ref = createAccountReference(accountName);
         if (ref != null) {
             accountList.put(accountName, ref);
@@ -83,30 +61,30 @@
         return ref;
     }
 
-    public EndpointReferenceType createEprAccount(String accountName) {
+    public W3CEndpointReference createEprAccount(String accountName) {
         System.out.println("[Bank] Called createEprAccount( " + accountName + " )...");
         System.out.println();
-        EndpointReferenceType ref = createAccountReference(accountName);
+        W3CEndpointReference ref = createAccountReference(accountName);
         if (ref != null) {
             accountList.put(accountName, ref);
         }
         return ref;
     }
 
-    public EndpointReferenceType getAccount(String accountName) {
+    public W3CEndpointReference getAccount(String accountName) {
         System.out.println("[Bank] Called getAccount( " + accountName + " )...");
         System.out.println();
         return accountList.get(accountName);
     }
 
-    public EndpointReferenceType getEprAccount(String accountName) {
+    public W3CEndpointReference getEprAccount(String accountName) {
         System.out.println("[Bank] Called getEprAccount( " + accountName + " )...");
         System.out.println();
         return accountList.get(accountName);
     }
 
     // TODO: What is the correct implementation for this operation?
-    public EndpointReferenceType getAccountEprWithNoUseAttribute(String accountName) {
+    public W3CEndpointReference getAccountEprWithNoUseAttribute(String accountName) {
         return null;
     }
     
@@ -122,24 +100,14 @@
         ep.stop();
     }
 
-    private EndpointReferenceType createAccountReference(String accountName) {
-        String corbaAddress = "corbaloc::localhost:60000/" + accountName;
+    private W3CEndpointReference createAccountReference(String accountName) {
+        String corbaAddress = "corbaname::localhost:1050#" + accountName;
 
         Object account = new AccountImpl();
-        //Endpoint.publish(corbaAddress, account);
         Endpoint ep = Endpoint.publish(corbaAddress, account);
         endpointList.put(accountName, ep);
-        
-        // TODO: can we just use the EndpointReferenceUtils.getEndpointRef(manager, impl);
-        
-        EndpointReferenceType ref = 
-            EndpointReferenceUtils.getEndpointReference(wsdlURL,
-                                                        ACCOUNT_SERVICE_NAME,
-                                                        ACCOUNT_PORT_NAME.getLocalPart());
-        EndpointReferenceUtils.setInterfaceName(ref, ACCOUNT_PORT_TYPE);
-        EndpointReferenceUtils.setAddress(ref, corbaAddress);
-        
-        return ref;
+
+        return (W3CEndpointReference)ep.getEndpointReference((org.w3c.dom.Element[])null);
     }
 }
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/Server.java?rev=636910&r1=636829&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/Server.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/corba/bank_ws_addressing/src/yoko/server/Server.java Thu Mar 13 15:51:39 2008
@@ -26,9 +26,8 @@
     protected Server() throws Exception {
         System.out.println("Starting Server");
 
-        String wsdlLocation = "file:./BankWS-corba.wsdl";
-        Object implementor = new BankImpl(wsdlLocation);
-        String address = "corbaloc::localhost:40000/Bank";
+        Object implementor = new BankImpl();
+        String address = "corbaname::localhost:1050#Bank";
         Endpoint.publish(address, implementor);
     }
 

Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java?rev=636910&r1=636909&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java Thu Mar 13 15:51:39 2008
@@ -156,7 +156,7 @@
     }
 
     public String getAttributeType(int arg0) {
-        return null;
+        return "CDATA";
     }
 
     public String getAttributeValue(int arg0) {

Modified: incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java?rev=636910&r1=636909&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java (original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java Thu Mar 13 15:51:39 2008
@@ -42,7 +42,7 @@
 
     public static final String WSDLI_NAMESPACE_URI = "http://www.w3.org/2006/01/wsdl-instance";
     public static final String ADDRESSING_NAMESPACE_URI = "http://www.w3.org/2005/08/addressing";
-    public static final String ADDRESSING_WSDL_NAMESPACE_URI = "http://www.w3.org/2005/02/addressing/wsdl";
+    public static final String ADDRESSING_WSDL_NAMESPACE_URI = "http://www.w3.org/2006/05/addressing/wsdl";
     
     private static final Logger LOG = LogUtils.getL7dLogger(CorbaObjectReferenceHelper.class);
     

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=636910&r1=636909&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Thu Mar 13 15:51:39 2008
@@ -33,6 +33,7 @@
 import javax.xml.ws.WebServiceException;
 import javax.xml.ws.WebServicePermission;
 import javax.xml.ws.handler.Handler;
+import javax.xml.ws.http.HTTPBinding;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
 import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
 
@@ -51,7 +52,6 @@
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.InterceptorProvider;
-import org.apache.cxf.jaxws.binding.soap.SOAPBindingImpl;
 import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
 import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
 import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
@@ -508,12 +508,11 @@
         if (!isPublished()) {
             throw new WebServiceException(new Message("ENDPOINT_NOT_PUBLISHED", LOG).toString());
         }
-        
-        String bindingId = getBinding().getBindingID();        
-        if (!SOAPBindingImpl.isSoapBinding(bindingId)) {
+
+        if (getBinding() instanceof HTTPBinding) {        
             throw new UnsupportedOperationException(new Message("GET_ENDPOINTREFERENCE_UNSUPPORTED_BINDING",
                                                                 LOG).toString());
-        }
+        }        
         
         W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
         builder.address(address);

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/Messages.properties?rev=636910&r1=636909&r2=636910&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/Messages.properties (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/Messages.properties Thu Mar 13 15:51:39 2008
@@ -52,4 +52,4 @@
 
 ENDPOINT_NOT_PUBLISHED = Endpoint has not been published yet. 
 ENDPOINTREFERENCE_TYPE_NOT_SUPPORTED = Class type {0} is not a subclass of EndpointReference or the Endpoint implementation does not support EndpointReferences of this type.
-GET_ENDPOINTREFERENCE_UNSUPPORTED_BINDING = getEndpointReference not support binding <{0}>, only support SOAP 1.1/HTTP or SOAP 1.2/HTTP.
\ No newline at end of file
+GET_ENDPOINTREFERENCE_UNSUPPORTED_BINDING = getEndpointReference not support binding HTTP Binding.
\ No newline at end of file



Mime
View raw message