Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk

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

8 files changed, 0 insertions, 498 deletions

diff --git a/branches/sca-java-1.5/itest/policy-security-token/pom.xml b/branches/sca-java-1.5/itest/policy-security-token/pom.xml
deleted file mode 100644
index 40fc1b03d8..0000000000
--- a/branches/sca-java-1.5/itest/policy-security-token/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-itest</artifactId>
-        <version>1.5-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-policy-security-token</artifactId>
-    <name>Apache Tuscany SCA iTest Policy Security Token Authentication</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.5-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-policy</artifactId>
-            <version>1.5-SNAPSHOT</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>5.2.0</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-           <groupId>org.apache.geronimo.specs</groupId>
-           <artifactId>geronimo-jms_1.1_spec</artifactId>
-           <version>1.1</version>
-           <scope>provided</scope>
-           <exclusions>
-               <exclusion>
-                   <groupId>org.apache.geronimo.specs</groupId>
-                   <artifactId>geronimo-jms_1.1_spec</artifactId>
-               </exclusion>
-           </exclusions>
-        </dependency>  
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>httpunit</groupId>
-            <artifactId>httpunit</artifactId>
-            <version>1.6.1</version>
-            <scope>test</scope>
-        </dependency>        
-
-    </dependencies>
-</project>
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java b/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
deleted file mode 100644
index 769be60538..0000000000
--- a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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;
-    
-    @Reference
-    protected HelloWorldService helloworldJMS;    
-
-    public String getGreetings(String name) {
-        return  helloworldWS.getGreetings(name) + 
-                helloworldJMS.getGreetings(name);
-    }
-
-}
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 268d90e910..0000000000
--- a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java b/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
deleted file mode 100644
index 60c07f6f73..0000000000
--- a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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 java.security.Principal;
-
-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 {
-        	String response = "Hello " + name + " ";
-        	
-        	for (Principal principal : subject.getPrincipals()){
-        		response += principal.getName();
-        	}
-        	
-            return response + " ";
-        }
-    }
-
-}
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml b/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml
deleted file mode 100644
index f7bb9bc374..0000000000
--- a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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="Axis2TokenAuthenticationPolicySet"
-                   provides="authentication"
-                   appliesTo="sca:binding.ws">
-                
-        <tuscany:axis2TokenAuthentication xmlns:foo="http://tuscany.apache.org/foo" tokenName="foo:myname"/>
-    </sca:policySet>
-    
-    <sca:policySet name="JMSTokenAuthenticationPolicySet"
-                   provides="authentication"
-                   appliesTo="sca:binding.jms">
-                
-        <tuscany:jmsTokenAuthentication xmlns:foo="http://tuscany.apache.org/foo" tokenName="foo:myname"/>
-    </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/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite b/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite
deleted file mode 100644
index 1db89fd502..0000000000
--- a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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>
-        <reference name="helloworldJMS" requires="authentication">
-            <binding.jms uri="jms:HelloWorldService"/>
-        </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>
-    
-    <component name="HelloWorldServiceJMSComponent">
-        <implementation.java class="helloworld.HelloWorldServiceImpl" requires="tuscany:identity"/>
-        <service name="HelloWorldService" requires="authentication">
-            <interface.java interface="helloworld.HelloWorldService"/>
-            <binding.jms/>
-        </service>
-    </component>    
-</composite>
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties b/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties
deleted file mode 100644
index 9abdff215d..0000000000
--- a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as. 
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java b/branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
deleted file mode 100644
index b0ae00b639..0000000000
--- a/branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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 TokenAuthTestCase {
-    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", 
-                                                        TokenAuthTestCase.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("Tokens reported at component context security subject = ");
-        System.out.println(greetings);
-        Assert.assertEquals("Hello Simon SomeWSAuthorizationToken Hello Simon DummyTokenID ", 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
-    @Ignore
-    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(); 
-    }    
-}