Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835127 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 290 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
new file mode 100644
index 0000000000..4d511f887e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

+           xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

+           targetNamespace="http://sample"

+           xmlns:sample="http://sample"

+           xmlns:calc="http://calculator"

+           name="Calculator">

+

+    <component name="CalculatorServiceComponent">

+		<implementation.java class="calculator.CalculatorServiceImpl"/>

+        <reference name="addService" >

+           <interface.java interface="calculator.AddService" />        

+            <binding.ws uri="http://localhost:8080/sample-calculator-ws-secure-webapp/AddServiceComponent"

+            			requires="authentication" />        

+        </reference>   

+        <reference name="subtractService">

+        	<interface.java interface="calculator.SubtractService" />        

+            <binding.ws uri="http://localhost:8080/sample-calculator-ws-secure-webapp/SubtractServiceComponent"

+            			requires="integrity" />

+        </reference>

+        <reference name="multiplyService" target="MultiplyServiceComponent"></reference>

+        <reference name="divideService" target="DivideServiceComponent"></reference>

+    </component>

+

+    <component name="AddServiceComponent">

+        <implementation.java class="calculator.AddServiceImpl"/>

+        <service name="AddService">

+             <interface.java interface="calculator.AddService" />  

+             <binding.ws requires="authentication"/>

+        </service>

+    </component>

+

+    <component name="SubtractServiceComponent">

+        <implementation.java class="calculator.SubtractServiceImpl"/>

+        <service name="SubtractService">

+             <interface.java interface="calculator.SubtractService" />  

+             <binding.ws requires="integrity"/>

+        </service>

+    </component>

+

+    <component name="MultiplyServiceComponent">

+        <implementation.java class="calculator.MultiplyServiceImpl"/>

+    </component>

+

+    <component name="DivideServiceComponent">

+        <implementation.java class="calculator.DivideServiceImpl"/>

+    </component>

+    

+</composite>

diff --git a/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
new file mode 100644
index 0000000000..858e87a34f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+# KIND, either express or implied.  See the License for the

+# specific language governing permissions and limitations

+# under the License.

+# 

+# PolicyHandlerClasses to interpret specific PolicyModels against specific QoS infrastructures

+# handler classname;qname=<policy intent addressed>;model=<policy model class>

+org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyHandler;intent=http://calculator#wsAuthentication,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy

+org.apache.tuscany.sca.policy.security.ws.WSSecurityPolicyHandler;intent=http://calculator#wsIntegrity,model=org.apache.neethi.Policy
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks b/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
new file mode 100644
index 0000000000..b6b244244b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
diff --git a/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
new file mode 100644
index 0000000000..4611669bbd
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="ASCII"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+-->

+<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"

+ 			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"

+ 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

+ 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

+ 			xmlns:calc="http://calculator">

+

+ 

+ <!-- WS Security POLICY SETS -->

+  <sca:policySet name="calc:wsAuthenticationPolicy"

+ 	provides="sca:authentication"

+ 	appliesTo="sca:service/sca:binding.ws"

+ 	>

+ 	<tuscany:wsConfigParam>

+ 		<parameter name="InflowSecurity">

+ 			<action>

+ 				<items>UsernameToken</items>

+ 				<passwordCallbackClass>calculator.security.ServerPWCBHandler</passwordCallbackClass>

+       		</action>

+      	</parameter>

+ 	</tuscany:wsConfigParam>

+ </sca:policySet>

+ 

+ <sca:policySet name="calc:wsClientAuthenticationPolicy"

+ 	provides="sca:authentication"

+ 	appliesTo="sca:reference/sca:binding.ws">

+ 	<tuscany:wsConfigParam>

+ 		<parameter name="OutflowSecurity">

+ 			<action>

+ 				<items>UsernameToken</items>

+ 				<user>CalculatorUser</user>

+				<passwordCallbackClass>calculator.security.ClientPWCBHandler</passwordCallbackClass>" +

+                <passwordType>PasswordText</passwordType>

+               </action>

+    	</parameter>

+ 	</tuscany:wsConfigParam>

+ </sca:policySet>

+ 

+ 

+ <sca:policySet name="tuscany:wsSecurityPolicyForIntegrity"

+ 	provides="sca:integrity"

+ 	appliesTo="sca:service/sca:binding.ws">

+ 	<wsp:Policy wsu:Id="SignOnly" 

+ 		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>

+				<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>

+	

+				<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 

+					<ramp:user>CalculatorAdmin</ramp:user>

+					<ramp:encryptionUser>CalculatorAdmin</ramp:encryptionUser>

+					<ramp:passwordCallbackClass>calculator.security.ServerPWCBHandler</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">calculatorKeys.jks</ramp:property>

+							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">CalculatorAdmin</ramp:property>

+						</ramp:crypto>

+					</ramp:signatureCrypto>

+				</ramp:RampartConfig>

+			</wsp:All>

+		</wsp:ExactlyOne>

+	</wsp:Policy>

+ </sca:policySet>

+ 

+ <sca:policySet name="tuscany:wsSecurityPolicyForClientIntegrity"

+ 	provides="sca:integrity"

+ 	appliesTo="sca:reference/sca:binding.ws">

+ 	<wsp:Policy wsu:Id="SignOnly" 

+ 		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>

+				<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>

+	

+				<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 

+					<ramp:user>CalculatorAdmin</ramp:user>

+					<ramp:encryptionUser>CalculatorAdmin</ramp:encryptionUser>

+					<ramp:passwordCallbackClass>calculator.security.ClientPWCBHandler</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">calculatorKeys.jks</ramp:property>

+							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">CalculatorAdmin</ramp:property>

+						</ramp:crypto>

+					</ramp:signatureCrypto>

+				</ramp:RampartConfig>

+			</wsp:All>

+		</wsp:ExactlyOne>

+	</wsp:Policy>

+ </sca:policySet>

+ 

+ </sca:definitions>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
new file mode 100644
index 0000000000..a7a6f3aa9c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.3/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
@@ -0,0 +1,4 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin

+org.apache.ws.security.crypto.merlin.keystore.type=jks

+org.apache.ws.security.crypto.merlin.keystore.password=CalculatorAdmin

+org.apache.ws.security.crypto.merlin.file=calculatorKeys.jks
\ No newline at end of file