Refactoring sandbox structure to accomodate 1.x versus 2.x stuff

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

17 files changed, 0 insertions, 824 deletions

diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/build-dojo.xml b/sandbox/lresende/sca/samples/store-secure-webapp/build-dojo.xml
deleted file mode 100644
index 6167eba10e..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/build-dojo.xml
+++ /dev/null
@@ -1,62 +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 name="DojoZipInstaller">
-    <property name="dojo.version" value="1.3.0"/>
-	<property name="dojo.zip" value="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-    <property name="unpack.location" value="${basedir}/src/main/resources/dojo"/>
-	
-
-    <target name="check-dojo-installed">
-        <condition property="already.installed" >
-            <available file="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
-        </condition>
-    </target>
-
-    <target name="check-dojo-unpacked">
-        <condition property="already.unpacked" >
-            <available file="${unpack.location}"/>
-        </condition>
-    </target>
-
-    <target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
-        <fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
-        <mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
-        <unzip src="${localRepository}/org/dojotoolkit/dojo/${dojo.version}/dojo-${dojo.version}.zip"
-               dest="${basedir}/target/dojo-unpack-temp/"
-               overwrite="false"
-        	   encoding="native-encoding">
-            <patternset>
-                <include name="dojo-${dojo.version}/dojo/**"/>
-                <exclude name="dojo-${dojo.version}/dojo/tests/**"/>
-                <exclude name="dojo-${dojo.version}/dijit/**"/>
-                <exclude name="dojo-${dojo.version}/dojox/**"/>
-                <exclude name="dojo-${dojo.version}/util/**"/>
-            </patternset>
-        </unzip>
-        <move file="${basedir}/target/dojo-unpack-temp/dojo-${dojo.version}"
-              tofile="${unpack.location}"
-              verbose="true"/>
-        <delete dir="${basedir}/target/dojo-unpack-temp/"/>
-    </target>
-	
-    <target name="clean-dojo-files">
-        <delete dir="${unpack.location}"/>
-    </target>
-</project>
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/build.xml b/sandbox/lresende/sca/samples/store-secure-webapp/build.xml
deleted file mode 100644
index fce9338312..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/build.xml
+++ /dev/null
@@ -1,119 +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.
--->
-
-<project name="sample-store-secure-webapp" default="compile">
-
-    <target name="compile">
-        <mkdir dir="target/classes"/>
-        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src/main/java"/>
-            <classpath>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
-            </classpath>
-        </javac>
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <war destfile="target/sample-store-secure-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
-            <fileset dir="src/main/webapp"/>
-            <lib refid="tuscany.jars"/>
-            <lib refid="3rdparty.jars"/>
-            <classes dir="target/classes"/>
-        </war>
-    </target>
-
-    <target name="package" depends="compile"/>
-
-    <target name="clean">
-        <delete includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-
-    <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xsd-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jsonrpc-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jsonrpc-runtime-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-core-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-json-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-endpoint-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-host-webapp-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-node-api-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-node-impl-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-security-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-security-http-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-extension-1.6-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-1.6-SNAPSHOT.jar"/>
-    </fileset>
-    <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="XmlSchema-1.4.2.jar"/>
-        <include name="activation-1.1.jar"/>
-        <include name="asm-all-3.1.jar"/>
-        <include name="axiom-api-1.2.7.jar"/>
-        <include name="axiom-impl-1.2.7.jar"/>
-        <include name="cglib-nodep-2.2.jar"/>
-        <include name="commons-codec-1.3.jar"/>
-        <include name="commons-logging-1.1.1.jar"/>
-        <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
-        <include name="geronimo-javamail_1.4_spec-1.2.jar"/>
-        <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
-        <include name="jaxb-api-2.1.jar"/>
-        <include name="jaxb-impl-2.1.7.jar"/>
-        <include name="jaxen-1.1.1.jar"/>
-        <include name="jaxws-api-2.1.jar"/>
-        <include name="jettison-1.0.1.jar"/>
-        <include name="json-rpc-1.0.jar"/>
-        <include name="jsr181-api-1.0-MR1.jar"/>
-        <include name="jsr250-api-1.0.jar"/>
-        <include name="stax-api-1.0-2.jar"/>
-        <include name="wstx-asl-3.2.4.jar"/>
-    </fileset>
-
-</project>
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml b/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml
deleted file mode 100644
index b95dda30fd..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/pom.xml
+++ /dev/null
@@ -1,144 +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-sca</artifactId>
-        <version>1.7-SNAPSHOT</version>
-    </parent>
-    <artifactId>sample-store-secure-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Store in a WebApp</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-        	<version>1.7-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-        	<version>1.7-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-        	<version>1.7-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-        	<version>1.7-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security-http</artifactId>
-        	<version>1.7-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security-geronimo</artifactId>
-        	<version>1.7-SNAPSHOT</version>
-        </dependency>        
-        
-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- marking dependency as provided to exclude from war file -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>        
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <!-- version>1.1</version -->
-			    <dependencies>
-			        <dependency>
-			    	    <groupId>ant</groupId>
-			    	    <artifactId>ant-trax</artifactId>
-			    	    <version>1.6.5</version>
-			        </dependency>
-			    </dependencies>
-                <executions>
-                    <execution>
-                        <id>copy-dojo-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                    <property name="artifactId" value="${artifactId}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>clean-dojo-files</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-dojo.xml" target="clean-dojo-files">
-                                    <property name="localRepository" value="${settings.localRepository}"/>
-                                    <property name="artifactId" value="${artifactId}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-          </plugins>
-    </build>
-</project>
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/Catalog.java b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/Catalog.java
deleted file mode 100644
index 0d8d3d561a..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/Catalog.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package services;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Catalog {
-	Item[] get();
-}
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/CurrencyConverter.java b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/CurrencyConverter.java
deleted file mode 100644
index 15b2c6e3a6..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/CurrencyConverter.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package services;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CurrencyConverter {
-    public double getConversion(String fromCurrenycCode, 
-    							String toCurrencyCode, 
-    							double amount);
-
-    public String getCurrencySymbol(String currencyCode);
-}
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/CurrencyConverterImpl.java b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/CurrencyConverterImpl.java
deleted file mode 100644
index 2bf9d8d42b..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/CurrencyConverterImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package services;
-
-public class CurrencyConverterImpl implements CurrencyConverter {
-    public double getConversion(String fromCurrencyCode, 
-    							String toCurrencyCode, 
-    							double amount) {
-        if (toCurrencyCode.equals("USD"))
-            return amount;
-        else if (toCurrencyCode.equals("EUR"))
-            return ((double)Math.round(amount * 0.7256 * 100)) /100;
-        return 0;
-    }
-
-    public String getCurrencySymbol(String currencyCode) {
-        if (currencyCode.equals("USD"))
-            return "$";
-        else if (currencyCode.equals("EUR"))
-            return "E"; //"€";
-        return "?";
-    }
-}
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/FruitsCatalogImpl.java b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/FruitsCatalogImpl.java
deleted file mode 100644
index 4cac4ac21d..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/FruitsCatalogImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package services;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-
-public class FruitsCatalogImpl implements Catalog {
-	@Property
-	public String currencyCode = "USD";
-	@Reference
-	public CurrencyConverter currencyConverter;
-
-	private List<Item> catalog = new ArrayList<Item>();
-
-	@Init
-	public void init() {
-		String currencySymbol = currencyConverter
-				.getCurrencySymbol(currencyCode);
-		catalog.add(new Item("Apple", currencySymbol
-				+ currencyConverter.getConversion("USD", currencyCode, 2.99)));
-		catalog.add(new Item("Orange", currencySymbol
-				+ currencyConverter.getConversion("USD", currencyCode, 3.55)));
-		catalog.add(new Item("Pear", currencySymbol
-				+ currencyConverter.getConversion("USD", currencyCode, 1.55)));
-	}
-
-	public Item[] get() {
-		Item[] catalogArray = new Item[catalog.size()];
-		catalog.toArray(catalogArray);
-		return catalogArray;
-	}
-}
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/Item.java b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/Item.java
deleted file mode 100644
index e8bcfabfb1..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/services/Item.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package services;
-
-public class Item {
-	private String name;
-	private String price;
-
-	public Item() {
-	}
-
-	public Item(String name, String price) {
-		this.name = name;
-		this.price = price;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getPrice() {
-		return price;
-	}
-
-	public void setPrice(String price) {
-		this.price = price;
-	}
-}
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/store/security/StoreCallbackHandler.java b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/store/security/StoreCallbackHandler.java
deleted file mode 100644
index 88e3a778a0..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/java/store/security/StoreCallbackHandler.java
+++ /dev/null
@@ -1,50 +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 store.security;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class StoreCallbackHandler implements CallbackHandler {
-
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-        for (int i = 0; i < callbacks.length; i++) {
-            if (callbacks[i] instanceof NameCallback) {
-                NameCallback nc = (NameCallback)callbacks[i];
-                nc.setName("PWEST");
-            } else if (callbacks[i] instanceof PasswordCallback) {
-                PasswordCallback pc = (PasswordCallback)callbacks[i];
-                pc.setPassword("xxx".toCharArray());
-            } else {
-                throw new UnsupportedCallbackException
-                 (callbacks[i], "Unsupported Callback!");
-            }
-          }
-    }
-
-}
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/resources/definitions.xml b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/resources/definitions.xml
deleted file mode 100644
index 55789c8443..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,73 +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.    
--->
-<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:store="http://store">
-
-    <!-- PolicySets -->
-    <!-- sca:policySet xmlns="http://www.osoa.org/xmlns/sca/1.0"
-               name="jsonRPCsecurityPolicy" 
-			   provides="sca:authentication"
- 	           appliesTo="tuscany:binding.jsonrpc">
- 		<tuscany:authenticationConfiguration realm="ldap-realm"/>
-  </sca:policySet-->
-  
-  
-    <!-- PolicySets -->
-    <!-- policySet xmlns="http://www.osoa.org/xmlns/sca/1.0"
-               name="JaasPolicy" 
-               provides="tuscany:jaasAuthentication" 
-               appliesTo="sca:implementation.java">
-               
-        <tuscany:jaasAuthentication>
-            <tuscany:configurationName>ldap-realm</tuscany:configurationName>
-            <tuscany:callbackHandler>store.security.StoreCallbackHandler</tuscany:callbackHandler>
-        </tuscany:jaasAuthentication>
-    </policySet-->
-
-    <!-- PolicySets -->
-    <policySet xmlns="http://www.osoa.org/xmlns/sca/1.0"
-               name="RealmBaseAuthenticationPolicy" 
-               provides="sca:authentication" 
-               appliesTo="sca:implementation.java">
-               
-        <tuscany:ldapRealmAuthentication>
-            <tuscany:realm>ldap-realm</tuscany:realm>
-            <tuscany:realmConfigurationName>ldap-realm</tuscany:realmConfigurationName>
-        </tuscany:ldapRealmAuthentication>
-    </policySet>
-
-   <policySet xmlns="http://www.osoa.org/xmlns/sca/1.0"
-               name="allowUser"
-               provides="sca:authorization" 
-               appliesTo="sca:implementation.java">
-       <allow roles="user"/>
-    </policySet>  
-
-   <policySet xmlns="http://www.osoa.org/xmlns/sca/1.0"
-               name="allowManager"
-               provides="sca:authorization" 
-               appliesTo="sca:implementation.java">
-       <allow roles="manager"/>
-    </policySet>  
-    
- </sca:definitions>
\ No newline at end of file
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/resources/store.composite b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/resources/store.composite
deleted file mode 100644
index 5c567cbd15..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/resources/store.composite
+++ /dev/null
@@ -1,41 +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"
-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	xmlns:s="http://store" 
-	targetNamespace="http://store" 
-	name="store">
-		
-	<component name="Catalog">
-		<implementation.java class="services.FruitsCatalogImpl">
-		    <operation name="get" policySets="allowManager"  /> <!-- requires="authorization" policySets="allowManager" -->
-		</implementation.java> 
-		<property name="currencyCode">USD</property>
-		<service name="Catalog">
-            <operation name="get" requires="authentication"/>
-			<tuscany:binding.jsonrpc/>
-		</service>
-		<reference name="currencyConverter" target="CurrencyConverter" />
-	</component>
-
-	<component name="CurrencyConverter">
-		<implementation.java class="services.CurrencyConverterImpl" />
-	</component>
-</composite>
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 41c84c9a44..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:store="http://store">
-   <deployable composite="store:store"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 705010bf7c..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<web:web-app
-	xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
-	xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0"
-	xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
-	xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
-	xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-2.0"
-	xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
-	xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2"
-	xmlns:pers="http://java.sun.com/xml/ns/persistence"
-	xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
-	xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
-	xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
-	<dep:environment>
-		<dep:moduleId>
-			<dep:groupId>org.apache.tuscany</dep:groupId>
-			<dep:artifactId>sample-store-secure-webapp</dep:artifactId>
-			<dep:version>1.0</dep:version>
-			<dep:type>car</dep:type>
-		</dep:moduleId>
-		<!-- TUSCANY-2622 -->
-		<dep:hidden-classes>
-			<dep:filter>org.apache.axiom</dep:filter>
-			<dep:filter>org.apache.axis2</dep:filter>
-			<dep:filter>org.apache.commons</dep:filter>
-			<dep:filter>org.jdom</dep:filter>
-		</dep:hidden-classes>		
-	</dep:environment>
-	
-	<web:context-root>/sample-store-secure-webapp</web:context-root>
-	
-	<web:security-realm-name>ldap-realm</web:security-realm-name>
-    <sec:security>
-        <sec:role-mappings>
-            <!--
-            <sec:role role-name="manager">
-                <sec:principal name="lmanager" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" />
-            </sec:role>            
-            <sec:role role-name="user">
-                <sec:principal name="lresende" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" />
-            </sec:role>
-            -->
-            <sec:role role-name="manager">
-                <sec:principal name="managers" class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" designated-run-as="true"/>
-            </sec:role>            
-        </sec:role-mappings>
-    </sec:security>
-    
-    <dep:gbean name="ldap-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
-        <dep:attribute name="realmName">ldap-realm</dep:attribute>
-        <dep:xml-reference name="LoginModuleConfiguration">
-            <lc:login-config>
-                <lc:login-module control-flag="REQUIRED" wrap-principals="false">
-                    <lc:login-domain-name>ldap-realm</lc:login-domain-name>
-                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.LDAPLoginModule</lc:login-module-class>
-                    <!-- lc:option name="users">foo,bar</lc:option-->
-                    <lc:option name="initialContextFactory">com.sun.jndi.ldap.LdapCtxFactory</lc:option>
-                    <lc:option name="connectionURL">ldap://dpev007.innovate.ibm.com:389</lc:option>
-                    <lc:option name="connectionUsername">cn=ldaproot,dc=tnc,dc=org</lc:option>
-                    <lc:option name="connectionPassword">ldappass</lc:option>
-                    <lc:option name="authentication">simple</lc:option>
-                    <lc:option name="userBase">ou=people,dc=tnc,dc=org</lc:option>
-                    <lc:option name="userSearchMatching">uid={0}</lc:option>
-                    <lc:option name="userSearchSubtree">false</lc:option>
-                    <lc:option name="roleBase">ou=groups,dc=tnc,dc=org</lc:option>
-                    <lc:option name="roleName">cn</lc:option>
-                    <lc:option name="roleSearchMatching">(member={0})</lc:option>
-                    <lc:option name="roleSearchSubtree">false</lc:option>                    
-                </lc:login-module>
-            </lc:login-config>
-        </dep:xml-reference>
-    </dep:gbean>
-</web:web-app>
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 704c7631b0..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
-  <display-name>sample-store-secure-webapp</display-name>
-
-  <filter>
-    <filter-name>tuscany</filter-name> 
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
-  </filter>
-
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/*</url-pattern> 
-  </filter-mapping>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>store.html</welcome-file>
-  </welcome-file-list>
-  
-  <!-- login-config>
-  	<auth-method>BASIC</auth-method>
-  	<realm-name>ldap-realm</realm-name>
-  </login-config-->
-  
-  <login-config>
-    <auth-method>FORM</auth-method>
-    <realm-name>ldap-realm</realm-name>
-    <form-login-config>
-       <form-login-page>/auth/logon.html</form-login-page>
-       <form-error-page>/auth/logonError.html</form-error-page>
-    </form-login-config>
-  </login-config>
-    
-  <security-role>
-  	<description>Application managers</description>
-  	<role-name>manager</role-name>
-  </security-role>
-
-  <security-role>
-  	<description>Application users</description>
-  	<role-name>user</role-name>
-  </security-role>
-  
-  <security-constraint>
-  	<web-resource-collection>
-  		<web-resource-name>Areas with authentication required</web-resource-name>
-  		<url-pattern>/protected/*</url-pattern>
-  		<http-method>GET</http-method>
-  		<http-method>POST</http-method>
-  	</web-resource-collection>
-  	<auth-constraint>
-  		<role-name>manager</role-name>
-  	</auth-constraint>
-  </security-constraint>
-  
-  <env-entry>
-     <env-entry-name>org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled</env-entry-name>
-     <env-entry-type>java.lang.String</env-entry-type>
-     <env-entry-value>false</env-entry-value>
-  </env-entry>
-</web-app>
\ No newline at end of file
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/auth/logon.html b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/auth/logon.html
deleted file mode 100644
index 09191f7010..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/auth/logon.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<H1>Store Authentication</H1>
-<form method="POST" action="j_security_check">
-<table border="0" cellspacing="2" cellpadding="1">
-<tr>
-  <td>Username:</td>
-  <td><input size="12" value="" name="j_username" maxlength="25" type="text"></td>
-</tr>
-<tr>
-  <td>Password:</td>
-  <td><input size="12" value="" name="j_password" maxlength="25" type="password"></td>
-</tr>
-<tr>
-  <td colspan="2" align="center">
-    <input name="submit" type="submit" value="Login">
-  </td>
-</tr>
-</table>
-</form>
-</HTML>
\ No newline at end of file
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/auth/logonError.html b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/auth/logonError.html
deleted file mode 100644
index c0c0f7b75d..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/auth/logonError.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<HTML>
-<H1>Store Authentication ERROR</H1>
-Username, password or role incorrect.
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
-</HTML>
\ No newline at end of file
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/store.html b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/store.html
deleted file mode 100644
index e4cd0ba12d..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/store.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html>
-<head>
-<title>Store</title>
-
-<script type="text/javascript" src="dojo/dojo/dojo.js"></script>
-
-<script type="text/javascript">
-    	dojo.require("dojo.rpc.JsonService");
-</script>
-
-<script language="JavaScript">
-
-	var catalog = new dojo.rpc.JsonService("Catalog?smd");
-	
-	var catalogItems;
-
-	function catalog_getResponse(items) {
-		var catalog = "";
-		for (var i=0; i<items.length; i++) {
-			var item = items[i].name + ' - ' + items[i].price;
-			catalog += '<input name="items" type="checkbox" value="' + 
-						item + '">' + item + ' <br>';
-		}
-		document.getElementById('catalog').innerHTML=catalog;
-		catalogItems = items;
-	}
-	
-	function init() {
-		catalog.get().addCallback(catalog_getResponse);
-	}
-	
-</script>
-
-</head>
-
-<body onload="init()">
-<h1>Store</h1>
-  <div id="store">
-   	<h2>Catalog</h2>
-   	<form name="catalogForm">
-		<div id="catalog" ></div>
-		<br>
-   	</form>
- 
- 	<br>    
-  </div>
-</body>
-</html>