You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2006/12/20 13:23:42 UTC
svn commit: r489066 [19/24] - in
/webservices/axis2/branches/java/1_1/modules: adb-codegen/
adb-codegen/src/org/apache/axis2/schema/
adb-codegen/src/org/apache/axis2/schema/i18n/
adb-codegen/src/org/apache/axis2/schema/template/ adb-codegen/test-resour...
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/service2/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/service2/META-INF/services.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/service2/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/service2/META-INF/services.xml Wed Dec 20 04:23:24 2006
@@ -1,3 +1,20 @@
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<service name="">
<!-- these are Service Parameters -->
<parameter name="para1" locked="xsd:true">10</parameter>
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/service2/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/service2/build.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/service2/build.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/service2/build.xml Wed Dec 20 04:23:24 2006
@@ -1,4 +1,21 @@
<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<project basedir="." default="jar">
<property name="src" location="."/>
<property name="build" location="build"/>
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/axis2.xml Wed Dec 20 04:23:24 2006
@@ -1,3 +1,20 @@
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<axisconfig name="AxisJava2.0">
<!-- ================================================= -->
<!-- Parameters -->
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/services/serviceGroup/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/services/serviceGroup/META-INF/services.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/services/serviceGroup/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/services/serviceGroup/META-INF/services.xml Wed Dec 20 04:23:24 2006
@@ -1,3 +1,20 @@
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<serviceGroup>
<service name="service1">
<operation name="op1">
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceModule/META-INF/module.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceModule/META-INF/module.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceModule/META-INF/module.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceModule/META-INF/module.xml Wed Dec 20 04:23:24 2006
@@ -1,3 +1,20 @@
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<module name="serviceModule" class="org.apache.axis2.InavalidModuleImpl">
<InFlow>
<handler name="h1" class="org.apache.axis2.ModuleHandler1">
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceModule/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceModule/build.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceModule/build.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceModule/build.xml Wed Dec 20 04:23:24 2006
@@ -1,4 +1,21 @@
<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<project basedir="." default="jar">
<property name="src" location="."/>
<property name="build" location="build"/>
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/eprTest.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/eprTest.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/eprTest.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/eprTest.xml Wed Dec 20 04:23:24 2006
@@ -1,3 +1,20 @@
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
<soapenv:Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
<soapenv:Reference4>Value 400</soapenv:Reference4>
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/soapmessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/soapmessage.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/soapmessage.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/soapmessage.xml Wed Dec 20 04:23:24 2006
@@ -1,3 +1,20 @@
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
<soapenv:Header>
<wsa:MessageID soapenv:mustUnderstand="0">uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/test.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/test.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/test.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/test.xml Wed Dec 20 04:23:24 2006
@@ -1,3 +1,20 @@
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
<soapenv:Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
<soapenv:Reference4>Value 400</soapenv:Reference4>
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/wsdl/actionTests.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/wsdl/actionTests.wsdl?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/wsdl/actionTests.wsdl (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/wsdl/actionTests.wsdl Wed Dec 20 04:23:24 2006
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:tns="http://ws.apache.org/axis2/actiontest/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
@@ -8,67 +25,67 @@
<wsdl:types>
</wsdl:types>
<wsdl:message name="echoResponse">
- <wsdl:part name="echoResponse" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoRequest">
- <wsdl:part name="echoRequest" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoResponse1">
- <wsdl:part name="echoResponse1" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoRequest1">
- <wsdl:part name="echoRequest1" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoechoFault">
- <wsdl:part name="echoechoFault" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoechoFault1">
- <wsdl:part name="echoechoFault1" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoResponse2">
- <wsdl:part name="echoResponse2" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoRequest2">
- <wsdl:part name="echoRequest2" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoechoFault2">
- <wsdl:part name="echoechoFault2" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoResponse3">
- <wsdl:part name="echoResponse3" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoRequest3">
- <wsdl:part name="echoRequest3" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoechoFault3">
- <wsdl:part name="echoechoFault3" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="withoutWSAWAction">
- <wsdl:operation name="echo">
+ <wsdl:part name="echoResponse" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echoRequest">
+ <wsdl:part name="echoRequest" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echoResponse1">
+ <wsdl:part name="echoResponse1" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echoRequest1">
+ <wsdl:part name="echoRequest1" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echoechoFault">
+ <wsdl:part name="echoechoFault" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echoechoFault1">
+ <wsdl:part name="echoechoFault1" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echoResponse2">
+ <wsdl:part name="echoResponse2" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echoRequest2">
+ <wsdl:part name="echoRequest2" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echoechoFault2">
+ <wsdl:part name="echoechoFault2" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echoResponse3">
+ <wsdl:part name="echoResponse3" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echoRequest3">
+ <wsdl:part name="echoRequest3" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echoechoFault3">
+ <wsdl:part name="echoechoFault3" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="withoutWSAWAction">
+ <wsdl:operation name="echo">
<wsdl:input message="tns:echoRequest" name="NamedInput"></wsdl:input>
<wsdl:output message="tns:echoResponse" name="NamedOutput"></wsdl:output>
- <wsdl:fault name="echoFault" message="tns:echoechoFault"></wsdl:fault>
+ <wsdl:fault name="echoFault" message="tns:echoechoFault"></wsdl:fault>
</wsdl:operation>
</wsdl:portType>
<wsdl:portType name="withWSAWAction">
<wsdl:operation name="echo">
<wsdl:input message="tns:echoRequest1" wsaw:Action="http://example.org/action/echoIn"></wsdl:input>
<wsdl:output message="tns:echoResponse1" wsaw:Action="http://example.org/action/echoOut"></wsdl:output>
- <wsdl:fault name="echoFault" message="tns:echoechoFault1" wsaw:Action="http://example.org/action/echoFault"></wsdl:fault>
+ <wsdl:fault name="echoFault" message="tns:echoechoFault1" wsaw:Action="http://example.org/action/echoFault"></wsdl:fault>
</wsdl:operation>
</wsdl:portType>
<wsdl:portType name="withoutWSAWActionNoName">
<wsdl:operation name="echo">
<wsdl:input message="tns:echoRequest2"></wsdl:input>
<wsdl:output message="tns:echoResponse2"></wsdl:output>
- <wsdl:fault name="echoFault" message="tns:echoechoFault2"></wsdl:fault>
+ <wsdl:fault name="echoFault" message="tns:echoechoFault2"></wsdl:fault>
</wsdl:operation>
</wsdl:portType>
<wsdl:portType name="withSOAPAction">
<wsdl:operation name="echo">
<wsdl:input message="tns:echoRequest3"></wsdl:input>
- <wsdl:output message="tns:echoResponse3"></wsdl:output>
- <wsdl:fault name="echoFault" message="tns:echoechoFault3"></wsdl:fault>
+ <wsdl:output message="tns:echoResponse3"></wsdl:output>
+ <wsdl:fault name="echoFault" message="tns:echoechoFault3"></wsdl:fault>
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="withoutWSAWActionBinding"
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/wsdl/test1.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/wsdl/test1.wsdl?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/wsdl/test1.wsdl (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/wsdl/test1.wsdl Wed Dec 20 04:23:24 2006
@@ -1,69 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- WSDL description of the WSS Ping interop scenarios -->
-
-<definitions name="Echo"
- targetNamespace="http://ws.apache.org/axis2/tests"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
- xmlns:tns="http://ws.apache.org/axis2/tests"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
- xmlns:intf="http://ws-policy.tests">
-
- <types>
- <schema targetNamespace="http://xmlsoap.org/Echo"
- xmlns="http://www.w3.org/2001/XMLSchema">
- <complexType name="echo">
- <sequence>
- <element name="text" type="xsd:string" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="echoResponse">
- <sequence>
- <element name="text" type="xsd:string" nillable="true"/>
- </sequence>
- </complexType>
- <element name="Echo" type="tns:echo"/>
- <element name="EchoResponse" type="tns:echoResponse"/>
- </schema>
- </types>
-
- <message name="EchoRequest">
- <part name="echo" element="tns:Echo"/>
- </message>
-
- <message name="EchoResponse">
- <part name="echoResponse" element="tns:EchoResponse"/>
- </message>
-
- <portType name="EchoPort">
- <operation name="Echo">
- <input message="tns:EchoRequest" wsa:Action="http://tests.org/echo/in" />
- <output message="tns:EchoResponse" wsa:Action="http://tests.org/echo/out" />
- </operation>
- </portType>
-
- <binding name="EchoBinding" type="tns:EchoPort">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http"
-style="document"/>
- <operation name="Echo">
- <soap:operation soapAction="http://ws.apache.org/axis2/tests/echo"/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
-
- <service name="EchoService">
- <port name="EchoPort" binding="tns:EchoBinding">
- <soap:address location="http://localhost:8080/axis2/services/EchoService"/>
- </port>
- </service>
-
-</definitions>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<!-- WSDL description of the WSS Ping interop scenarios -->
+
+<definitions name="Echo"
+ targetNamespace="http://ws.apache.org/axis2/tests"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+ xmlns:tns="http://ws.apache.org/axis2/tests"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+ xmlns:intf="http://ws-policy.tests">
+
+ <types>
+ <schema targetNamespace="http://xmlsoap.org/Echo"
+ xmlns="http://www.w3.org/2001/XMLSchema">
+ <complexType name="echo">
+ <sequence>
+ <element name="text" type="xsd:string" nillable="true"/>
+ </sequence>
+ </complexType>
+ <complexType name="echoResponse">
+ <sequence>
+ <element name="text" type="xsd:string" nillable="true"/>
+ </sequence>
+ </complexType>
+ <element name="Echo" type="tns:echo"/>
+ <element name="EchoResponse" type="tns:echoResponse"/>
+ </schema>
+ </types>
+
+ <message name="EchoRequest">
+ <part name="echo" element="tns:Echo"/>
+ </message>
+
+ <message name="EchoResponse">
+ <part name="echoResponse" element="tns:EchoResponse"/>
+ </message>
+
+ <portType name="EchoPort">
+ <operation name="Echo">
+ <input message="tns:EchoRequest" wsa:Action="http://tests.org/echo/in" />
+ <output message="tns:EchoResponse" wsa:Action="http://tests.org/echo/out" />
+ </operation>
+ </portType>
+
+ <binding name="EchoBinding" type="tns:EchoPort">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http"
+style="document"/>
+ <operation name="Echo">
+ <soap:operation soapAction="http://ws.apache.org/axis2/tests/echo"/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name="EchoService">
+ <port name="EchoPort" binding="tns:EchoBinding">
+ <soap:address location="http://localhost:8080/axis2/services/EchoService"/>
+ </port>
+ </service>
+
+</definitions>
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/wsdl/test2.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/wsdl/test2.wsdl?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/wsdl/test2.wsdl (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/wsdl/test2.wsdl Wed Dec 20 04:23:24 2006
@@ -1,100 +1,117 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- WSDL description of the WSS Ping interop scenarios -->
-
-<definitions name="Echo"
- targetNamespace="http://ws.apache.org/axis2/tests"
- xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
- xmlns:tns="http://ws.apache.org/axis2/tests"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
- xmlns:intf="http://ws-policy.tests">
-
- <wsp:Policy wsu:Id="Message1-2">
- <intf:MessagePolicyTestAssertion2 marker="6" />
- </wsp:Policy>
-
- <wsp:Policy wsu:Id="Operation1-2">
- <intf:OperationPolicyTestAssertion2 marker="6" />
- </wsp:Policy>
-
- <wsp:Policy wsu:Id="Endpoint1-2">
- <intf:EndpointPolicyTestAssertion2 marker="7" />
- </wsp:Policy>
-
- <types>
- <schema targetNamespace="http://xmlsoap.org/Echo"
- xmlns="http://www.w3.org/2001/XMLSchema">
- <complexType name="echo">
- <sequence>
- <element name="text" type="xsd:string" nillable="true"/>
- </sequence>
- </complexType>
- <complexType name="echoResponse">
- <sequence>
- <element name="text" type="xsd:string" nillable="true"/>
- </sequence>
- </complexType>
- <element name="Echo" type="tns:echo"/>
- <element name="EchoResponse" type="tns:echoResponse"/>
- </schema>
- </types>
-
- <message name="EchoRequest">
- <part name="echo" element="tns:Echo"/>
- </message>
-
- <message name="EchoResponse">
- <part name="echoResponse" element="tns:EchoResponse"/>
- </message>
-
- <portType name="EchoPort" wsp:PolicyURIs="#Endpoint1-2">
- <operation name="Echo">
- <wsp:PolicyReference URI="#Operation1-2"/>
- <input message="tns:EchoRequest" wsp:PolicyURIs="#Message1-2" wsa:Action="http://tests.org/echo/in"/>
- <output message="tns:EchoResponse" wsp:PolicyURIs="#Message1-2" wsa:Action="http://tests.org/echo/out" />
- </operation>
- </portType>
-
- <binding name="EchoBinding" type="tns:EchoPort">
- <wsp:Policy wsu:Id="Endpoint2">
- <intf:EndpointPolicyTestAssertion1 marker="6" />
- </wsp:Policy>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http"
-style="document"/>
- <operation name="Echo">
- <wsp:Policy>
- <intf:OperationPolicyTestAssertion2 marker="3" />
- </wsp:Policy>
- <soap:operation soapAction="http://ws.apache.org/axis2/tests/echo"/>
- <input>
- <wsp:Policy>
- <intf:MessagePolicyTestAssertion1 marker="2" />
- </wsp:Policy>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- <wsp:Policy>
- <intf:MessagePolicyTestAssertion1 marker="1" />
- </wsp:Policy>
- </output>
- </operation>
- </binding>
-
- <service name="EchoService">
- <wsp:Policy>
- <intf:ServicePolicyTestAssertion1 marker="5" />
- </wsp:Policy>
- <port name="EchoPort" binding="tns:EchoBinding">
- <wsp:Policy>
- <intf:EndpointPolicyTestAssertion1 marker="4" />
- </wsp:Policy>
- <soap:address location="http://localhost:8080/axis2/services/EchoService"/>
- </port>
- </service>
-
-</definitions>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<!-- WSDL description of the WSS Ping interop scenarios -->
+
+<definitions name="Echo"
+ targetNamespace="http://ws.apache.org/axis2/tests"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+ xmlns:tns="http://ws.apache.org/axis2/tests"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+ xmlns:intf="http://ws-policy.tests">
+
+ <wsp:Policy wsu:Id="Message1-2">
+ <intf:MessagePolicyTestAssertion2 marker="6" />
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="Operation1-2">
+ <intf:OperationPolicyTestAssertion2 marker="6" />
+ </wsp:Policy>
+
+ <wsp:Policy wsu:Id="Endpoint1-2">
+ <intf:EndpointPolicyTestAssertion2 marker="7" />
+ </wsp:Policy>
+
+ <types>
+ <schema targetNamespace="http://xmlsoap.org/Echo"
+ xmlns="http://www.w3.org/2001/XMLSchema">
+ <complexType name="echo">
+ <sequence>
+ <element name="text" type="xsd:string" nillable="true"/>
+ </sequence>
+ </complexType>
+ <complexType name="echoResponse">
+ <sequence>
+ <element name="text" type="xsd:string" nillable="true"/>
+ </sequence>
+ </complexType>
+ <element name="Echo" type="tns:echo"/>
+ <element name="EchoResponse" type="tns:echoResponse"/>
+ </schema>
+ </types>
+
+ <message name="EchoRequest">
+ <part name="echo" element="tns:Echo"/>
+ </message>
+
+ <message name="EchoResponse">
+ <part name="echoResponse" element="tns:EchoResponse"/>
+ </message>
+
+ <portType name="EchoPort" wsp:PolicyURIs="#Endpoint1-2">
+ <operation name="Echo">
+ <wsp:PolicyReference URI="#Operation1-2"/>
+ <input message="tns:EchoRequest" wsp:PolicyURIs="#Message1-2" wsa:Action="http://tests.org/echo/in"/>
+ <output message="tns:EchoResponse" wsp:PolicyURIs="#Message1-2" wsa:Action="http://tests.org/echo/out" />
+ </operation>
+ </portType>
+
+ <binding name="EchoBinding" type="tns:EchoPort">
+ <wsp:Policy wsu:Id="Endpoint2">
+ <intf:EndpointPolicyTestAssertion1 marker="6" />
+ </wsp:Policy>
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http"
+style="document"/>
+ <operation name="Echo">
+ <wsp:Policy>
+ <intf:OperationPolicyTestAssertion2 marker="3" />
+ </wsp:Policy>
+ <soap:operation soapAction="http://ws.apache.org/axis2/tests/echo"/>
+ <input>
+ <wsp:Policy>
+ <intf:MessagePolicyTestAssertion1 marker="2" />
+ </wsp:Policy>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ <wsp:Policy>
+ <intf:MessagePolicyTestAssertion1 marker="1" />
+ </wsp:Policy>
+ </output>
+ </operation>
+ </binding>
+
+ <service name="EchoService">
+ <wsp:Policy>
+ <intf:ServicePolicyTestAssertion1 marker="5" />
+ </wsp:Policy>
+ <port name="EchoPort" binding="tns:EchoBinding">
+ <wsp:Policy>
+ <intf:EndpointPolicyTestAssertion1 marker="4" />
+ </wsp:Policy>
+ <soap:address location="http://localhost:8080/axis2/services/EchoService"/>
+ </port>
+ </service>
+
+</definitions>
Modified: webservices/axis2/branches/java/1_1/modules/kernel/test/org/apache/axis2/transport/sample.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test/org/apache/axis2/transport/sample.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test/org/apache/axis2/transport/sample.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test/org/apache/axis2/transport/sample.xml Wed Dec 20 04:23:24 2006
@@ -1,3 +1,20 @@
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
<soapenv:Header>
<wsa:MessageID soapenv:mustUnderstand="0">uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
Modified: webservices/axis2/branches/java/1_1/modules/rahas/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/maven.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/maven.xml Wed Dec 20 04:23:24 2006
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
Modified: webservices/axis2/branches/java/1_1/modules/rahas/src/META-INF/module.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/src/META-INF/module.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/src/META-INF/module.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/src/META-INF/module.xml Wed Dec 20 04:23:24 2006
@@ -1,41 +1,58 @@
-<module name="rahas">
- <Description>This module is used to STS enable a service where it adds
- the RequestSecurityToken operation to a service that the module is engaged to</Description>
-
- <supported-policy-namespaces namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>
-
- <operation name="RequestSecurityToken" mep="http://www.w3.org/2004/08/wsdl/in-out">
- <messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
-
- <!-- Action mapping to accept SCT requests -->
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
-
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT/Cancel</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate</actionMapping>
-
- <parameter name="token-dispatcher-configuration">
- <token-dispatcher-configuration>
- <!-- Issuers. You may have many issuers. -->
- <issuer class="org.apache.rahas.impl.SCTIssuer" default="true">
- <configuration type="parameter">sct-issuer-config</configuration>
- <tokenType>http://schemas.xmlsoap.org/ws/2005/02/sc/sct</tokenType>
- </issuer>
- <issuer class="org.apache.rahas.impl.SAMLTokenIssuer">
- <configuration type="parameter">saml-issuer-config</configuration>
- <tokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</tokenType>
- </issuer>
-
- <!-- Only a single canceler is allowed -->
- <canceler class="org.apache.rahas.impl.TokenCancelerImpl">
- <configuration type="parameter">token-canceler-config</configuration>
- </canceler>
-
- </token-dispatcher-configuration>
- </parameter>
-
- </operation>
-
-</module>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<module name="rahas">
+ <Description>This module is used to STS enable a service where it adds
+ the RequestSecurityToken operation to a service that the module is engaged to</Description>
+
+ <supported-policy-namespaces namespaces="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"/>
+
+ <operation name="RequestSecurityToken" mep="http://www.w3.org/2004/08/wsdl/in-out">
+ <messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
+
+ <!-- Action mapping to accept SCT requests -->
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
+
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT/Cancel</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate</actionMapping>
+
+ <parameter name="token-dispatcher-configuration">
+ <token-dispatcher-configuration>
+ <!-- Issuers. You may have many issuers. -->
+ <issuer class="org.apache.rahas.impl.SCTIssuer" default="true">
+ <configuration type="parameter">sct-issuer-config</configuration>
+ <tokenType>http://schemas.xmlsoap.org/ws/2005/02/sc/sct</tokenType>
+ </issuer>
+ <issuer class="org.apache.rahas.impl.SAMLTokenIssuer">
+ <configuration type="parameter">saml-issuer-config</configuration>
+ <tokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</tokenType>
+ </issuer>
+
+ <!-- Only a single canceler is allowed -->
+ <canceler class="org.apache.rahas.impl.TokenCancelerImpl">
+ <configuration type="parameter">token-canceler-config</configuration>
+ </canceler>
+
+ </token-dispatcher-configuration>
+ </parameter>
+
+ </operation>
+
+</module>
Modified: webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/services.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/services.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/rahas/sts-aar-resources/services.xml Wed Dec 20 04:23:24 2006
@@ -1,89 +1,106 @@
-<!-- Security token service configuration -->
-<service name="STS">
-
- <operation name="RequestSecurityToken">
- <messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
-
- <!-- Action mapping to accept SCT requests -->
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
-
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT/Cancel</actionMapping>
- <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate</actionMapping>
-
- </operation>
-
- <!-- Using the config file -->
- <parameter name="token-dispatcher-configuration-file">META-INF/token-dispatcher-configuration.xml</parameter>
-
- <!-- Configure Rampart to authenticate clients -->
- <wsp:Policy wsu:Id="SigOnly" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <wsp:ExactlyOne>
- <wsp:All>
-
- <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
-
- <ramp:user>ip</ramp:user>
- <ramp:encryptionUser>useReqSigCert</ramp:encryptionUser>
- <ramp:passwordCallbackClass>PWCBHandler</ramp:passwordCallbackClass>
-
- <ramp:signatureCrypto>
- <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
- <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.file">META-INF/rahas-sts.jks</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
- </ramp:crypto>
- </ramp:signatureCrypto>
-
- </ramp:RampartConfig>
-
- <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:TripleDesRsa15/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:OnlySignEntireHeadersAndBody/>
- </wsp:Policy>
- </sp:AsymmetricBinding>
- <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- </wsp:Policy>
- </sp:Wss10>
- <sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <sp:Body/>
- </sp:SignedParts>
- </wsp:All>
- </wsp:ExactlyOne>
- </wsp:Policy>
-
-</service>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<!-- Security token service configuration -->
+<service name="STS">
+
+ <operation name="RequestSecurityToken">
+ <messageReceiver class="org.apache.rahas.STSMessageReceiver"/>
+
+ <!-- Action mapping to accept SCT requests -->
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT</actionMapping>
+
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT/Cancel</actionMapping>
+ <actionMapping>http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate</actionMapping>
+
+ </operation>
+
+ <!-- Using the config file -->
+ <parameter name="token-dispatcher-configuration-file">META-INF/token-dispatcher-configuration.xml</parameter>
+
+ <!-- Configure Rampart to authenticate clients -->
+ <wsp:Policy wsu:Id="SigOnly" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+
+ <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
+
+ <ramp:user>ip</ramp:user>
+ <ramp:encryptionUser>useReqSigCert</ramp:encryptionUser>
+ <ramp:passwordCallbackClass>PWCBHandler</ramp:passwordCallbackClass>
+
+ <ramp:signatureCrypto>
+ <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.file">META-INF/rahas-sts.jks</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+ </ramp:crypto>
+ </ramp:signatureCrypto>
+
+ </ramp:RampartConfig>
+
+ <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:TripleDesRsa15/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ </wsp:Policy>
+ </sp:Wss10>
+ <sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:Body/>
+ </sp:SignedParts>
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+</service>
Modified: webservices/axis2/branches/java/1_1/modules/saaj/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/saaj/maven.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/saaj/maven.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/saaj/maven.xml Wed Dec 20 04:23:24 2006
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
Modified: webservices/axis2/branches/java/1_1/modules/saaj/test-resources/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/saaj/test-resources/axis2.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/saaj/test-resources/axis2.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/saaj/test-resources/axis2.xml Wed Dec 20 04:23:24 2006
@@ -1,124 +1,141 @@
-<axisconfig name="AxisJava2.0">
- <!-- ================================================= -->
- <!-- Parameters -->
- <!-- ================================================= -->
- <parameter name="hotdeployment" locked="false">true</parameter>
- <parameter name="hotupdate" locked="false">false</parameter>
- <parameter name="enableMTOM" locked="false">true</parameter>
- <parameter name="cacheAttachments" locked="false">false</parameter>
- <!-- Uncomment this to enable REST support -->
- <!-- <parameter name="eanbleREST" locked="false">true</parameter>-->
-
-
- <parameter name="userName" locked="false">admin</parameter>
- <parameter name="password" locked="false">axis2</parameter>
-
-
-
- <!-- ================================================= -->
- <!-- Message Receivers -->
- <!-- ================================================= -->
- <!-- This is the Deafult Message Receiver for the Request Response style Operations -->
- <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-
- <!-- ================================================= -->
- <!-- Transport Ins -->
- <!-- ================================================= -->
- <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port" locked="false">6060</parameter>
- </transportReceiver>
-
- <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
- <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
- <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
- <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
- </transportReceiver> -->
-
- <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
- <parameter name="port" locked="false">6060</parameter>
- </transportReceiver>
-
- <!-- ================================================= -->
- <!-- Transport Outs -->
- <!-- ================================================= -->
-
- <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
- <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
- </transportSender>
- <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
- <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-
- <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
- <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
- <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
- <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
- </transportSender>
- -->
-
- <!-- ================================================= -->
- <!-- Global Modules -->
- <!-- ================================================= -->
- <!-- Uncomment this to enable Addressing
- <module ref="addressing"/> -->
-
- <!-- ================================================= -->
- <!-- Phases -->
- <!-- ================================================= -->
- <phaseOrder type="InFlow">
- <!-- System pre defined phases -->
- <phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
- <handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
- </phase>
- <!-- System pre defined phases -->
- <!-- After Postdispatch phase module author or or service author can add any phase he want -->
- <phase name="userphase1"/>
- </phaseOrder>
- <phaseOrder type="OutFlow">
- <!-- user can add his own phases to this area -->
- <phase name="userphase1"/>
- <!--system predefined phase-->
- <!--these phase will run irrespective of the service-->
- <phase name="PolicyDetermination"/>
- <phase name="MessageOut"/>
- </phaseOrder>
- <phaseOrder type="InFaultFlow">
- <!-- user can add his own phases to this area -->
- <phase name="userphase1"/>
- </phaseOrder>
- <phaseOrder type="OutFaultFlow">
- <!-- user can add his own phases to this area -->
- <phase name="userphase1"/>
- <phase name="PolicyDetermination"/>
- <phase name="MessageOut"/>
- </phaseOrder>
-</axisconfig>
-
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<axisconfig name="AxisJava2.0">
+ <!-- ================================================= -->
+ <!-- Parameters -->
+ <!-- ================================================= -->
+ <parameter name="hotdeployment" locked="false">true</parameter>
+ <parameter name="hotupdate" locked="false">false</parameter>
+ <parameter name="enableMTOM" locked="false">true</parameter>
+ <parameter name="cacheAttachments" locked="false">false</parameter>
+ <!-- Uncomment this to enable REST support -->
+ <!-- <parameter name="eanbleREST" locked="false">true</parameter>-->
+
+
+ <parameter name="userName" locked="false">admin</parameter>
+ <parameter name="password" locked="false">axis2</parameter>
+
+
+
+ <!-- ================================================= -->
+ <!-- Message Receivers -->
+ <!-- ================================================= -->
+ <!-- This is the Deafult Message Receiver for the Request Response style Operations -->
+ <messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port" locked="false">6060</parameter>
+ </transportReceiver>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
+ <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
+ <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
+ <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
+ <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
+ </transportReceiver> -->
+
+ <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port" locked="false">6060</parameter>
+ </transportReceiver>
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+ </transportSender>
+ <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
+
+ <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
+ <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
+ <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
+ <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+ </transportSender>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Global Modules -->
+ <!-- ================================================= -->
+ <!-- Uncomment this to enable Addressing
+ <module ref="addressing"/> -->
+
+ <!-- ================================================= -->
+ <!-- Phases -->
+ <!-- ================================================= -->
+ <phaseOrder type="InFlow">
+ <!-- System pre defined phases -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.engine.AddressingBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="InstanceDispatcher"
+ class="org.apache.axis2.engine.InstanceDispatcher">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="userphase1"/>
+ </phaseOrder>
+ <phaseOrder type="OutFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ <!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ </phaseOrder>
+ <phaseOrder type="InFaultFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ </phaseOrder>
+ <phaseOrder type="OutFaultFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ </phaseOrder>
+</axisconfig>
+
Modified: webservices/axis2/branches/java/1_1/modules/samples/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/build.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/build.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/build.xml Wed Dec 20 04:23:24 2006
@@ -1,4 +1,21 @@
<?xml version="1.0"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<!-- ======================================================================
Feb 11, 2005 1:04:21 PM
Modified: webservices/axis2/branches/java/1_1/modules/samples/conf/service4withhandler.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/conf/service4withhandler.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/conf/service4withhandler.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/conf/service4withhandler.xml Wed Dec 20 04:23:24 2006
@@ -1,3 +1,20 @@
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<service messageReceiver="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" style="rpc" contextPath="services">
<parameter name="ServiceClass" locked="false">userguide.sample1.EchoXML</parameter>
Modified: webservices/axis2/branches/java/1_1/modules/samples/conf/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/conf/services.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/conf/services.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/conf/services.xml Wed Dec 20 04:23:24 2006
@@ -1,3 +1,20 @@
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<service name="">
<parameter name="ServiceClass" locked="false">userguide.sample1.EchoXML</parameter>
<operation name="echo" qname="echo"/>
Modified: webservices/axis2/branches/java/1_1/modules/samples/databinding/StockQuote.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/databinding/StockQuote.xsd?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/databinding/StockQuote.xsd (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/databinding/StockQuote.xsd Wed Dec 20 04:23:24 2006
@@ -1,50 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://w3.ibm.com/schemas/services/2002/11/15/stockquote"
- xmlns="http://w3.ibm.com/schemas/services/2002/11/15/stockquote"
->
-
- <xsd:element name="quote">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="symbol" type="xsd:string"/>
- <xsd:element name="volume" type="xsd:integer"/>
- <xsd:element name="lastTrade" type="lastTradeType"/>
- <xsd:element name="change" type="changeType"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="changeType">
- <xsd:sequence>
- <xsd:element name="dollar" type="xsd:float"/>
- <xsd:element name="percent" type="xsd:float"/>
- <xsd:element name="positive" type="xsd:boolean"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="lastTradeType">
- <xsd:sequence>
- <xsd:element name="price" type="xsd:float"/>
- <xsd:element name="date" type="xsd:long"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <!-- Methods signatures -->
- <xsd:element name="getStockQuote">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="symbol" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="getStockQuoteResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="quote" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
-</xsd:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<xsd:schema
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://w3.ibm.com/schemas/services/2002/11/15/stockquote"
+ xmlns="http://w3.ibm.com/schemas/services/2002/11/15/stockquote"
+>
+
+ <xsd:element name="quote">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="symbol" type="xsd:string"/>
+ <xsd:element name="volume" type="xsd:integer"/>
+ <xsd:element name="lastTrade" type="lastTradeType"/>
+ <xsd:element name="change" type="changeType"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:complexType name="changeType">
+ <xsd:sequence>
+ <xsd:element name="dollar" type="xsd:float"/>
+ <xsd:element name="percent" type="xsd:float"/>
+ <xsd:element name="positive" type="xsd:boolean"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="lastTradeType">
+ <xsd:sequence>
+ <xsd:element name="price" type="xsd:float"/>
+ <xsd:element name="date" type="xsd:long"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <!-- Methods signatures -->
+ <xsd:element name="getStockQuote">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="symbol" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="getStockQuoteResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="quote" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+</xsd:schema>
Modified: webservices/axis2/branches/java/1_1/modules/samples/databinding/StockQuoteService.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/databinding/StockQuoteService.wsdl?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/databinding/StockQuoteService.wsdl (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/databinding/StockQuoteService.wsdl Wed Dec 20 04:23:24 2006
@@ -1,3 +1,20 @@
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
<definitions targetNamespace="http://w3.ibm.com/schemas/services/2002/11/15/stockquote/wsdl"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://w3.ibm.com/schemas/services/2002/11/15/stockquote/wsdl"
Modified: webservices/axis2/branches/java/1_1/modules/samples/databinding/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/databinding/build.xml?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/databinding/build.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/databinding/build.xml Wed Dec 20 04:23:24 2006
@@ -1,170 +1,187 @@
-<project basedir="." default="generate.service">
-
- <property environment="env"/>
-
- <property name="wsdl.uri" value="StockQuoteService.wsdl"/>
- <property name="service.target" value="build/service"/>
- <property name="client.target" value="build/client"/>
-
- <path id="axis2.classpath">
- <fileset dir="../../lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <macrodef name="CastorSourceGenerator">
- <attribute name="schema" default="NOT SET"/>
- <attribute name="package" default="NOT SET"/>
- <attribute name="output" default="NOT SET"/>
- <sequential>
- <echo/>
- <java classname="org.exolab.castor.builder.SourceGeneratorMain" fork="true">
- <classpath refid="axis2.classpath"/>
- <arg line="-i @{schema} -package @{package} -dest @{output}" />
- </java>
- </sequential>
- </macrodef>
-
- <!-- Build the service, then the client. -->
- <target name="jar">
- <ant dir="service" target="jar.server"/>
- <ant dir="client"/>
- </target>
-
- <target name="run.client" depends="generate.stub">
-
- <condition property="params.ok">
- <and>
- <isset property="url"/>
- <isset property="symbol"/>
- </and>
- </condition>
-
- <fail message="One of the parameters are not set. Usage: StockClient -Durl=<url> -Dsymbol=<symbol>"
- unless="params.ok"/>
-
- <java classname="samples.databinding.StockClient" fork="true">
- <arg line="${url} ${symbol}"/>
- <classpath>
- <pathelement location="${client.target}/StockService-test-client.jar"/>
- <path refid="axis2.classpath"/>
- </classpath>
- </java>
- </target>
-
- <target name="generate.all" depends="generate.service,generate.stub"/>
-
- <target name="generate.service">
-
- <delete dir="${service.target}"/>
- <mkdir dir="${service.target}"/>
- <mkdir dir="${service.target}/classes"/>
-
- <CastorSourceGenerator output="${service.target}/src"
- package="samples.databinding.data"
- schema="StockQuote.xsd"/>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true" classpathref="axis2.classpath">
- <arg line="-uri ${wsdl.uri}"/>
- <arg line="-ss"/>
- <arg line="-sd"/>
- <arg line="-p samples.databinding"/>
- <arg line="-d none"/>
- <arg line="-o ${service.target}"/>
- </java>
-
- <!--copy the already written skeleton class-->
- <copy todir="${service.target}/src/"
- overwrite="yes">
- <fileset dir="service/src">
- <include name="**/*.java"/>
- </fileset>
- </copy>
-
- <!--First let's compile the classes-->
- <javac debug="on" memoryMaximumSize="256m" memoryInitialSize="256m" fork="true"
- destdir="${service.target}/classes" srcdir="${service.target}/src"
- classpathref="axis2.classpath">
- </javac>
-
- <!--aar them up -->
- <copy toDir="${service.target}/classes/META-INF" failonerror="false">
- <fileset dir="${service.target}/resources">
- <include name="*.xml"/>
- <include name="*.wsdl"/>
- <include name="*.xsd"/>
- </fileset>
- </copy>
- <jar destfile="${service.target}/StockService.aar">
- <fileset excludes="**/Test.class" dir="${service.target}/classes"/>
- <fileset dir="${basedir}">
- <include name="lib/*.jar"/>
- </fileset>
- </jar>
-
- <copy file="${service.target}/StockService.aar" tofile="../../repository/services/StockService.aar"
- overwrite="true"/>
-
- </target>
-
- <target name="generate.stub" unless="skip.generate">
- <delete dir="${client.target}"/>
- <mkdir dir="${client.target}"/>
- <mkdir dir="${client.target}/classes"/>
-
-
- <CastorSourceGenerator output="${client.target}/src"
- package="samples.databinding.data"
- schema="StockQuote.xsd"/>
- <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true" classpathref="axis2.classpath">
- <arg line="-uri ${wsdl.uri}"/>
- <arg line="-u"/>
- <arg line="-p samples.databinding"/>
- <arg line="-d none"/>
- <arg line="-t"/>
- <arg line="-o ${client.target}"/>
- </java>
-
- <copy todir="${client.target}/src/"
- overwrite="yes">
- <fileset dir="client/src">
- <include name="**/*.java"/>
- </fileset>
- </copy>
-
- <!--now compile the stub classes-->
- <javac debug="on" memoryMaximumSize="256m" memoryInitialSize="256m" fork="true"
- srcdir="${client.target}/src"
- excludes="**/StockClient2*.*"
- destdir="${client.target}/classes"
- classpathref="axis2.classpath">
- </javac>
-
- <!--jar the compiled stuff-->
- <jar destfile="${client.target}/StockService-test-client.jar">
- <fileset dir="${client.target}/classes">
- <exclude name="**/META-INF/*.*"/>
- <exclude name="**/*MessageReceiver.class"/>
- <exclude name="**/*Skeleton.class"/>
- </fileset>
- </jar>
- </target>
-
- <!--We are not shipping castor and stax-utils jars with the release. This target can be used to
- download those jars that are required to run this sample.-->
- <target name="download.jars">
- <mkdir dir="lib"/>
-
- <get src="http://ws.zones.apache.org/repository/stax-utils/jars/stax-utils-20060915.jar"
- dest="lib/stax-utils-20060915.jar" verbose="true"/>
- <get src="http://dist.codehaus.org/castor/1.0.4/castor-1.0.4.jar" dest="lib/castor-1.0.4.jar"
- verbose="true"/>
- </target>
-
- <target name="clean">
- <delete dir="build"/>
- </target>
-
-</project>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project basedir="." default="generate.service">
+
+ <property environment="env"/>
+
+ <property name="wsdl.uri" value="StockQuoteService.wsdl"/>
+ <property name="service.target" value="build/service"/>
+ <property name="client.target" value="build/client"/>
+
+ <path id="axis2.classpath">
+ <fileset dir="../../lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <macrodef name="CastorSourceGenerator">
+ <attribute name="schema" default="NOT SET"/>
+ <attribute name="package" default="NOT SET"/>
+ <attribute name="output" default="NOT SET"/>
+ <sequential>
+ <echo/>
+ <java classname="org.exolab.castor.builder.SourceGeneratorMain" fork="true">
+ <classpath refid="axis2.classpath"/>
+ <arg line="-i @{schema} -package @{package} -dest @{output}" />
+ </java>
+ </sequential>
+ </macrodef>
+
+ <!-- Build the service, then the client. -->
+ <target name="jar">
+ <ant dir="service" target="jar.server"/>
+ <ant dir="client"/>
+ </target>
+
+ <target name="run.client" depends="generate.stub">
+
+ <condition property="params.ok">
+ <and>
+ <isset property="url"/>
+ <isset property="symbol"/>
+ </and>
+ </condition>
+
+ <fail message="One of the parameters are not set. Usage: StockClient -Durl=<url> -Dsymbol=<symbol>"
+ unless="params.ok"/>
+
+ <java classname="samples.databinding.StockClient" fork="true">
+ <arg line="${url} ${symbol}"/>
+ <classpath>
+ <pathelement location="${client.target}/StockService-test-client.jar"/>
+ <path refid="axis2.classpath"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="generate.all" depends="generate.service,generate.stub"/>
+
+ <target name="generate.service">
+
+ <delete dir="${service.target}"/>
+ <mkdir dir="${service.target}"/>
+ <mkdir dir="${service.target}/classes"/>
+
+ <CastorSourceGenerator output="${service.target}/src"
+ package="samples.databinding.data"
+ schema="StockQuote.xsd"/>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true" classpathref="axis2.classpath">
+ <arg line="-uri ${wsdl.uri}"/>
+ <arg line="-ss"/>
+ <arg line="-sd"/>
+ <arg line="-p samples.databinding"/>
+ <arg line="-d none"/>
+ <arg line="-o ${service.target}"/>
+ </java>
+
+ <!--copy the already written skeleton class-->
+ <copy todir="${service.target}/src/"
+ overwrite="yes">
+ <fileset dir="service/src">
+ <include name="**/*.java"/>
+ </fileset>
+ </copy>
+
+ <!--First let's compile the classes-->
+ <javac debug="on" memoryMaximumSize="256m" memoryInitialSize="256m" fork="true"
+ destdir="${service.target}/classes" srcdir="${service.target}/src"
+ classpathref="axis2.classpath">
+ </javac>
+
+ <!--aar them up -->
+ <copy toDir="${service.target}/classes/META-INF" failonerror="false">
+ <fileset dir="${service.target}/resources">
+ <include name="*.xml"/>
+ <include name="*.wsdl"/>
+ <include name="*.xsd"/>
+ </fileset>
+ </copy>
+ <jar destfile="${service.target}/StockService.aar">
+ <fileset excludes="**/Test.class" dir="${service.target}/classes"/>
+ <fileset dir="${basedir}">
+ <include name="lib/*.jar"/>
+ </fileset>
+ </jar>
+
+ <copy file="${service.target}/StockService.aar" tofile="../../repository/services/StockService.aar"
+ overwrite="true"/>
+
+ </target>
+
+ <target name="generate.stub" unless="skip.generate">
+ <delete dir="${client.target}"/>
+ <mkdir dir="${client.target}"/>
+ <mkdir dir="${client.target}/classes"/>
+
+
+ <CastorSourceGenerator output="${client.target}/src"
+ package="samples.databinding.data"
+ schema="StockQuote.xsd"/>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true" classpathref="axis2.classpath">
+ <arg line="-uri ${wsdl.uri}"/>
+ <arg line="-u"/>
+ <arg line="-p samples.databinding"/>
+ <arg line="-d none"/>
+ <arg line="-t"/>
+ <arg line="-o ${client.target}"/>
+ </java>
+
+ <copy todir="${client.target}/src/"
+ overwrite="yes">
+ <fileset dir="client/src">
+ <include name="**/*.java"/>
+ </fileset>
+ </copy>
+
+ <!--now compile the stub classes-->
+ <javac debug="on" memoryMaximumSize="256m" memoryInitialSize="256m" fork="true"
+ srcdir="${client.target}/src"
+ excludes="**/StockClient2*.*"
+ destdir="${client.target}/classes"
+ classpathref="axis2.classpath">
+ </javac>
+
+ <!--jar the compiled stuff-->
+ <jar destfile="${client.target}/StockService-test-client.jar">
+ <fileset dir="${client.target}/classes">
+ <exclude name="**/META-INF/*.*"/>
+ <exclude name="**/*MessageReceiver.class"/>
+ <exclude name="**/*Skeleton.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <!--We are not shipping castor and stax-utils jars with the release. This target can be used to
+ download those jars that are required to run this sample.-->
+ <target name="download.jars">
+ <mkdir dir="lib"/>
+
+ <get src="http://ws.zones.apache.org/repository/stax-utils/jars/stax-utils-20060915.jar"
+ dest="lib/stax-utils-20060915.jar" verbose="true"/>
+ <get src="http://dist.codehaus.org/castor/1.0.4/castor-1.0.4.jar" dest="lib/castor-1.0.4.jar"
+ verbose="true"/>
+ </target>
+
+ <target name="clean">
+ <delete dir="build"/>
+ </target>
+
+</project>
Modified: webservices/axis2/branches/java/1_1/modules/samples/databinding/castorbuilder.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/samples/databinding/castorbuilder.properties?view=diff&rev=489066&r1=489065&r2=489066
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/samples/databinding/castorbuilder.properties (original)
+++ webservices/axis2/branches/java/1_1/modules/samples/databinding/castorbuilder.properties Wed Dec 20 04:23:24 2006
@@ -1,3 +1,18 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
#
# Property file for SourceCodeGenerator
#
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org