Copy 1.6 release to new 1.6.1 branch

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

6 files changed, 320 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
new file mode 100644
index 0000000000..7345af7f7c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
@@ -0,0 +1,40 @@
+/*
+ * 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.    
+ */
+package helloworld;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements the HelloWorld service.
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldClientImpl implements HelloWorldService {
+    
+    @Reference
+    protected HelloWorldService helloworldWS;
+    
+
+
+    public String getGreetings(String name) {
+        return "Hello " + 
+                helloworldWS.getGreetings(name);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..268d90e910
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,30 @@
+/*
+ * 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.    
+ */
+package helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldService {
+
+    public String getGreetings(String name);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..6372570d1f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
@@ -0,0 +1,46 @@
+/*
+ * 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.    
+ */
+package helloworld;
+
+import javax.security.auth.Subject;
+
+import org.osoa.sca.RequestContext;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements the HelloWorld service.
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldServiceImpl implements HelloWorldService {
+
+    @Context
+    protected RequestContext requestContext;
+    
+    public String getGreetings(String name) {
+        Subject subject = requestContext.getSecuritySubject();
+        
+        if (subject == null){
+            return "Hello " + name + " null subject";
+        } else {
+            return "Hello " + name + " " + subject.toString();
+        }
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/resources/definitions.xml
new file mode 100644
index 0000000000..dbdf0cd263
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/resources/definitions.xml
@@ -0,0 +1,44 @@
+<?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.    
+-->
+<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
+             targetNamespace="http://itest/policy"
+    		 xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
+    		 xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+             xmlns:ip="http://itest/policy" >
+
+
+    <sca:policySet name="BasicAuthenticationPolicySet"
+                   provides="authentication"
+                   appliesTo="sca:binding.ws">
+        <tuscany:basicAuthentication>
+          <tuscany:userName>myname</tuscany:userName>
+          <tuscany:password>mypassword</tuscany:password>
+        </tuscany:basicAuthentication>
+    </sca:policySet>
+    
+    <sca:policySet name="ImplementationIdentityPolicySet"
+                    provides="tuscany:identity"
+                   appliesTo="sca:implementation.java">
+        <securityIdentity>
+            <useCallerIdentity/>
+        </securityIdentity>  
+    </sca:policySet>      
+      
+</definitions>
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..f883629180
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/main/resources/helloworld.composite
@@ -0,0 +1,46 @@
+<?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" 
+           targetNamespace="http://itest/policy"
+           xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+           xmlns:ip="http://itest/policy"
+           name="Helloworld">
+           
+    <component name="HelloWorldClientComponent">
+        <implementation.java class="helloworld.HelloWorldClientImpl" />
+        <service name="HelloWorldService">
+            <interface.java interface="helloworld.HelloWorldService"/>
+            <binding.sca/>
+        </service>
+        <reference name="helloworldWS" requires="authentication">
+            <binding.ws uri="http://localhost:8085/HelloWorldServiceWSComponent"/>
+        </reference>
+    </component>           
+
+    <component name="HelloWorldServiceWSComponent">
+        <implementation.java class="helloworld.HelloWorldServiceImpl" requires="tuscany:identity"/>
+        <service name="HelloWorldService" requires="authentication">
+        	<interface.java interface="helloworld.HelloWorldService"/>
+            <binding.ws uri="http://localhost:8085/HelloWorldServiceWSComponent"/>
+        </service>
+    </component>
+    
+</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
new file mode 100644
index 0000000000..b6e0444d2d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
@@ -0,0 +1,114 @@
+/*
+ * 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.    
+ */
+
+package org.apache.tuscany.sca.itest;
+
+import java.io.ByteArrayInputStream;
+
+import junit.framework.Assert;
+import helloworld.HelloWorldService;
+
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.ws.security.util.Base64;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.meterware.httpunit.PostMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+public class BasicAuthTestCase {
+    private static SCANode node;
+    private static HelloWorldService service;
+
+    @BeforeClass
+    public static void init() throws Exception {
+        try {
+            SCANodeFactory factory = SCANodeFactory.newInstance();
+            node = factory.createSCANodeFromClassLoader("helloworld.composite", 
+                                                        BasicAuthTestCase.class.getClassLoader());
+            node.start();
+            
+            service = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClientComponent");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    @AfterClass
+    public static void destroy() throws Exception {
+        node.stop();
+    }
+    
+    @Test
+    //@Ignore
+    public void testViaSCAClient() {
+        String greetings = service.getGreetings("Simon");
+        System.out.println(">>>" + greetings);
+    } 
+    
+    @Test
+    @Ignore
+    public void testWSViaNonSCAClient() {
+        
+        try {
+            String token ="MyToken";
+            String encToken = Base64.encode(token.getBytes());
+            
+            String response = callService("http://L3AW203:8085/HelloWorldServiceWSComponent",
+                                          "<?xml version='1.0' encoding='UTF-8'?>" +
+                                            "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\">" + 
+                                             "<soapenv:Header>" + 
+                                               "<ns2:Token xmlns:ns2=\"http://helloworld/\">" + encToken + "</ns2:Token>" + 
+                                             "</soapenv:Header>" + 
+                                             "<soapenv:Body>" + 
+                                               "<ns2:getGreetings xmlns:ns2=\"http://helloworld/\">" + 
+                                                 "<arg0>Simon</arg0>" + 
+                                               "</ns2:getGreetings>" + 
+                                             "</soapenv:Body>" + 
+                                            "</soapenv:Envelope>" );
+            System.out.println(">>>" + response);
+        } catch(Exception ex) {
+            System.out.println(ex.toString());
+        }
+    } 
+    
+    @Test
+    public void testJMSViaNonSCAClient() {
+        // TODO
+    }
+    
+    public String callService(String url, String requestString) throws Exception {
+        System.out.println("Request = " + requestString);
+        WebConversation wc   = new WebConversation();
+        wc.setAuthorization("Me", "MyPasswd");
+        WebRequest request   = new PostMethodWebRequest( url, 
+                                                         new ByteArrayInputStream(requestString.getBytes("UTF-8")),"text/xml");
+        request.setHeaderField("SOAPAction", "");
+        WebResponse response = wc.getResource(request);
+        System.out.println("Response= " + response.getText());               
+        Assert.assertEquals(200, response.getResponseCode());
+        return response.getText(); 
+    }    
+}