30 files changed, 0 insertions, 2559 deletions
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/LICENSE.txt b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/LICENSE.txt
deleted file mode 100644
index d645695673..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/README.txt b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/README.txt
deleted file mode 100644
index 9b26d1690a..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/README.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Apache Tuscany M1 build (May, 2006)
-===================================
-
-http://incubator.apache.org/tuscany/
-
-Tuscany is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Web Services PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects. 
-
-While incubation status is not necessarily a reflection of the completeness or 
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
-
-
-Support
--------
-
-Any problem with this release can be reported to the Tuscany mailing list 
-or in the JIRA issue tracker.
-
-Mailing list subscription:
-    tuscany-dev-subscribe@ws.apache.org
-
-Jira:
-    http://issues.apache.org/jira/browse/Tuscany
-
-
-Thank you for using Tuscany!
-
-
-The Tuscany Team. 
-
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/build.xml b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/build.xml
deleted file mode 100644
index 6cabfe08f5..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/build.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- -->
-<project name="samples" default="compile">
-    <property name="mainDir" value="../../.."/>
-    <path id="javac.classpath">
-        <fileset dir="${mainDir}/lib">
-            <include name="tuscany-runtime-incubating-M1.jar"/>
-        </fileset>
-        <fileset dir="${mainDir}/apache-tomcat-5.5.17/common/lib">
-            <include name="servlet-api.jar"/>
-            <include name="jsp-api.jar"/>
-        </fileset>
-    </path>
-    <path id="java.classpath">
-        <fileset dir="${mainDir}/lib">
-            <include name="tuscany-runtime-incubating-M1.jar"/>
-        </fileset>
-        <pathelement path="target/sample-bigbank-webclient.jar"/>
-    </path>
-    <path id="tools.classpath">
-        <fileset dir="${mainDir}/lib">
-            <include name="tuscany-runtime-incubating-M1.jar"/>
-        </fileset>
-        <fileset dir="${mainDir}/lib/tools">
-            <include name="tuscany-tools-incubating-M1.jar"/>
-        </fileset>
-    </path>
-
-    <target name="init">
-      <mkdir dir="target/classes"/>
-    </target>
-
-    <target name="compile" depends="init, xsd2sdo, wsdl2java">
-      <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-        <src path="target/sdo-source"/>
-        <src path="target/wsdl2java-source"/>
-        <src path="src/main/java"/>
-        <classpath refid="javac.classpath"/>
-      </javac>
-      <copy todir="target/classes">
-        <fileset dir="src/main/resources"/>
-      </copy>
-      <war destfile="target/sample-bigbank-webclient.war" webxml="src/main/webapp/WEB-INF/web.xml">
-        <classes dir="target/classes"/>
-      </war>
-    </target>
-
-    <target name="xsd2sdo">
-      <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="yes">
-        <arg value="-targetDirectory"/>
-        <arg value="target/sdo-source"/>
-        <arg value="src/main/resources/wsdl/AccountService.wsdl"/>
-        <classpath refid="tools.classpath"/>
-      </java>
-    </target>
-
-    <target name="wsdl2java">
-      <java classname="org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator" fork="yes">
-        <arg value="-targetDirectory"/>
-        <arg value="target/wsdl2java-source"/>
-        <arg value="src/main/resources/wsdl/AccountService.wsdl"/>
-        <classpath refid="tools.classpath"/>
-      </java>
-    </target>
-
-    <target name="clean">
-      <delete quiet="true" includeemptydirs="true">
-        <fileset dir="target" excludes="sample-bigbank-webclient-incubating-M1.war"/>
-      </delete>
-    </target>
-</project>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/pom.xml b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/pom.xml
deleted file mode 100644
index 3b51a419fb..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- -->
-<project>
-    <parent>
-        <groupId>org.apache.tuscany.samples.bigbank</groupId>
-        <artifactId>bigbank-scenario</artifactId>
-        <version>incubating-M1</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>sample-bigbank-webclient</artifactId>
-    <packaging>war</packaging>
-    <name>Tuscany BigBank Web Client Module</name>
-    <description>BigBank Scenario Sample - Web Front-End Module</description>
-    <version>incubating-M1</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>tomcat</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>5.0.18</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>tomcat</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>5.0.18</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                            
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sca.plugins</groupId>
-                <artifactId>tuscany-plugin-wsdl2java</artifactId>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <wsdlFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</wsdlFile>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/readme.htm b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/readme.htm
deleted file mode 100644
index d7e35ae92b..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/readme.htm
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-<!-- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -->
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-  <meta http-equiv="Content-Style-Type" content="text/css">
-  <title>Tuscany Hello World Web Sample</title>
-
-
-</head>
-
-
-<body onload="location.href='../readme.htm'">
-Please see 
-<a href="../readme.htm" >../readme.htm</a> 
-
-</body>
-</html>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java
deleted file mode 100644
index 7de9658d34..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/account/AccountServiceComponentImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.services.account;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.ServiceUnavailableException;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountService;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-/**
- */
-@Service(AccountService.class)
-public class AccountServiceComponentImpl implements AccountService {
-
-    private AccountService accountService;
-
-    @Reference
-    public void setAccountService(AccountService accountService) {
-        this.accountService = accountService;
-    }
-
-    /**
-     * 
-     */
-    public AccountServiceComponentImpl() {
-        super();
-    }
-
-    /**
-     * @see bigbank.account.services.account.AccountService#getAccountReport(java.lang.String)
-     */
-    public AccountReport getAccountReport(int customerID) {
-        try {
-            return accountService.getAccountReport(customerID);
-        } catch (Exception e) {
-            throw new ServiceUnavailableException(e);
-        }
-    }
-
-    public StockSummary purchaseStock(int customerID, StockSummary stockSummary) throws RemoteException {
-        try {
-            return accountService.purchaseStock(customerID, stockSummary);
-        } catch (Exception e) {
-            throw new ServiceUnavailableException(e);
-        }
-    }
-
-    public CustomerProfileData getCustomerProfile(String param2) throws RemoteException {
-        try {
-            return accountService.getCustomerProfile(param2);
-        } catch (Exception e) {
-            throw new ServiceUnavailableException(e);
-        }
-    }
-
-    public float deposit(String account, float amount) throws RemoteException {
-        try {
-            return accountService.deposit(account, amount);
-        } catch (Exception e) {
-            throw new ServiceUnavailableException(e);
-        }
-    }
-
-    public StockSummary sellStock(int purchaseLotNumber, int quantity) throws RemoteException {
-        try {
-            return accountService.sellStock(purchaseLotNumber, quantity);
-        } catch (Exception e) {
-            throw new ServiceUnavailableException(e);
-        }
-    }
-
-    public float withdraw(String account, float amount) throws RemoteException {
-        try {
-            return accountService.withdraw(account, amount);
-        } catch (Exception e) {
-            throw new ServiceUnavailableException(e);
-        }
-    }
-
-    public CustomerProfileData createAccount(CustomerProfileData customerProfile, boolean createSavings, boolean createCheckings)
-            throws RemoteException {
-
-        return accountService.createAccount(customerProfile, createSavings, createCheckings);
-    }
-
-}
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java
deleted file mode 100644
index 0de0ef85c3..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/AccountLoginServiceImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.services.profile;
-
-import java.rmi.RemoteException;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import com.bigbank.account.AccountService;
-import com.bigbank.account.CustomerProfileData;
-
-@Service(LoginService.class)
-public class AccountLoginServiceImpl implements LoginService {
-    @Reference
-    public AccountService accountService;
-
-    @Reference
-    public ProfileService profileService;
-
-    public int login(String userName, String password) throws RemoteException {
-
-        CustomerProfileData profileData = accountService.getCustomerProfile(userName);
-
-        if (!password.equals(profileData.getPassword())) {
-            return INVALID_PASSWORD;
-        }
-
-        profileService.setLoggedIn(true);
-        profileService.setFirstName(profileData.getFirstName());
-        profileService.setLastName(profileData.getLastName());
-        profileService.setId(profileData.getId());
-
-        return SUCCESS;
-    }
-}
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
deleted file mode 100644
index 465c1b3e7e..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.services.profile;
-
-import java.rmi.RemoteException;
-
-public interface LoginService {
-
-    public static final int SUCCESS = 1;
-
-    public static final int INVALID_LOGIN = -1;
-
-    public static final int INVALID_PASSWORD = -2;
-
-    public int login(String userName, String password) throws RemoteException;
-}
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java
deleted file mode 100644
index 2cbfbf489a..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.services.profile;
-
-public interface ProfileService {
-
-    public String getFirstName();
-
-    public void setFirstName(String pName);
-
-    public String getLastName();
-
-    public void setLastName(String pName);
-
-    public boolean isLoggedIn();
-
-    public void setLoggedIn(boolean pStatus);
-
-    public int getId();
-
-    public void setId(int pId);
-}
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java
deleted file mode 100644
index 4ae808f31a..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/ProfileServiceImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.services.profile;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ProfileService.class)
-@Scope("session")
-public class ProfileServiceImpl implements ProfileService {
-
-    private String firstName;
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    @Property
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    private String lastName;
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    private boolean loggedIn;
-
-    public boolean isLoggedIn() {
-        return loggedIn;
-    }
-
-    public void setLoggedIn(boolean status) {
-        loggedIn = status;
-    }
-
-    private int id;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-}
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java
deleted file mode 100644
index a8d57fb506..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/SimpleLoginServiceImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.services.profile;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(LoginService.class)
-public class SimpleLoginServiceImpl implements LoginService {
-
-    public ProfileService profileService;
-
-    @Reference
-    public void setProfileService(ProfileService profileService) {
-        this.profileService = profileService;
-    }
-
-    public int login(String userName, String password) {
-
-        if (!"test".equals(userName)) {
-            return INVALID_LOGIN;
-        }
-
-        if (!"password".equals(password)) {
-            return INVALID_PASSWORD;
-        }
-
-        profileService.setLoggedIn(true);
-        profileService.setFirstName("John");
-        profileService.setLastName("Doe");
-        profileService.setId(12345);
-
-        return SUCCESS;
-    }
-}
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java
deleted file mode 100644
index c11d3f9e46..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/AccountStatusTag.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.tags.account;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.osoa.sca.CurrentModuleContext;
-import org.osoa.sca.ModuleContext;
-
-import bigbank.webclient.services.profile.ProfileService;
-
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountService;
-
-/**
- * Retrieves and iterates over account summary information for the current profile by accessing the remotable account service component
- */
-
-public class AccountStatusTag extends TagSupport {
-
-    // ----------------------------------
-    // Constructors
-    // ----------------------------------
-
-    public AccountStatusTag() {
-        super();
-    }
-
-    // ----------------------------------
-    // Methods
-    // ----------------------------------
-
-    private String mAccountService;
-
-    public String getAccountService() {
-        return mAccountService;
-    }
-
-    public void setAccountService(String pAccountService) {
-        mAccountService = pAccountService;
-    }
-
-    private String mProfileService;
-
-    public String getProfileService() {
-        return mProfileService;
-    }
-
-    public void setProfileService(String pProfileService) {
-        mProfileService = pProfileService;
-    }
-
-    private String mId;
-
-    public String getId() {
-        return mId;
-    }
-
-    public void setId(String pId) {
-        mId = pId;
-    }
-
-    private Iterator mIterator;
-
-    public int doStartTag() throws JspException {
-        ModuleContext moduleContext = CurrentModuleContext.getContext();
-        ProfileService profile = (ProfileService) moduleContext.locateService(mProfileService);
-        if (profile == null) {
-            throw new JspException("Profile [" + mProfileService + "] not found in current module context");
-        }
-
-        AccountService service = (AccountService) moduleContext.locateService(mAccountService);
-        if (service == null) {
-            throw new JspException("Service [" + mAccountService + "] not found in current module context");
-        }
-        List summaries;
-        try {
-            AccountReport accountReport = service.getAccountReport(profile.getId());
-            pageContext.setAttribute("StockSummaries", accountReport.getStockSummaries());
-            summaries = accountReport.getAccountSummaries();
-        } catch (Exception e) {
-            throw new JspException(e);
-        }
-        mIterator = summaries.iterator();
-        if (mIterator.hasNext()) {
-            pageContext.setAttribute(mId, mIterator.next());
-            return EVAL_BODY_INCLUDE;
-        } else {
-            return SKIP_BODY;
-        }
-    }
-
-    public int doAfterBody() {
-        if (mIterator.hasNext()) {
-            pageContext.setAttribute(mId, mIterator.next());
-            return EVAL_BODY_AGAIN;
-        } else {
-            return SKIP_BODY;
-        }
-    }
-
-    public void release() {
-        super.release();
-        mId = null;
-        mIterator = null;
-    }
-}
-\ No newline at end of file
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java
deleted file mode 100644
index ac0b5f4467..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/account/StockStatusTag.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.tags.account;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-/**
- * Retrieves and iterates over account summary information for the current profile by accessing the remotable account service component
- */
-
-public class StockStatusTag extends TagSupport {
-
-
-    public StockStatusTag() {
-        super();
-    }
-
-
-    private String mId;
-
-    public String getId() {
-        return mId;
-    }
-
-    public void setId(String pId) {
-        mId = pId;
-    }
-
-    private Iterator mIterator;
-
-    public int doStartTag() throws JspException {
-
-        List summaries = (List) pageContext.getAttribute("StockSummaries");
-        if (null == summaries)
-            return SKIP_BODY;
-        mIterator = summaries.iterator();
-        if (mIterator.hasNext()) {
-            pageContext.setAttribute(mId, mIterator.next());
-            return EVAL_BODY_INCLUDE;
-        } else {
-            return SKIP_BODY;
-        }
-    }
-
-    public int doAfterBody() {
-        if (mIterator.hasNext()) {
-            pageContext.setAttribute(mId, mIterator.next());
-            return EVAL_BODY_AGAIN;
-        } else {
-            pageContext.setAttribute("StockSummaries", null);
-            return SKIP_BODY;
-        }
-    }
-
-    public void release() {
-        pageContext.setAttribute("StockSummaries", null);
-        super.release();
-        mId = null;
-        mIterator = null;
-    }
-}
-\ No newline at end of file
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java
deleted file mode 100644
index e923596bae..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/LoginBarrierTag.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.tags.sca;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.osoa.sca.CurrentModuleContext;
-import org.osoa.sca.ModuleContext;
-
-import bigbank.webclient.services.profile.ProfileService;
-
-public class LoginBarrierTag extends TagSupport {
-
-    public LoginBarrierTag() {
-        super();
-    }
-
-    private String mProfile;
-
-    public String getProfile() {
-        return mProfile;
-    }
-
-    public void setProfile(String pProfile) {
-        mProfile = pProfile;
-    }
-
-    private String mUrl;
-
-    public String getUrl() {
-        return mUrl;
-    }
-
-    public void setUrl(String pUrl) {
-        mUrl = pUrl;
-    }
-
-    int doPage = EVAL_PAGE;
-
-
-    public int doStartTag() throws JspException {
-        if (mProfile == null || mProfile.length() < 1) {
-            throw new JspException("Invalid profile location specified");
-        }
-
-        ModuleContext moduleContext = CurrentModuleContext.getContext();
-
-        ProfileService profile = (ProfileService) moduleContext.locateService(mProfile);
-
-        if (profile == null) {
-            throw new JspException("Profile [" + mProfile + "] not found in current module context");
-        }
-
-        if (profile.isLoggedIn()) {
-            return EVAL_BODY_INCLUDE;
-        } else {
-            try {
-                doPage = SKIP_PAGE;
-                pageContext.forward(mUrl);
-                ((HttpServletResponse) (pageContext.getResponse())).sendRedirect("login.html");
-                return SKIP_BODY;
-            } catch (ServletException e) {
-                throw new JspException("Unable to forward to [" + mUrl + "]");
-            } catch (IOException e) {
-                throw new JspException("Unable to forward to [" + mUrl + "]");
-            }
-        }
-    }
-
-    public int doEndTag() throws JspException {
-        return doPage;
-    }
-
-    public void release() {
-        super.release();
-    }
-
-}
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java
deleted file mode 100644
index 1fa4252c0c..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/tags/sca/ServiceTag.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.tags.sca;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.osoa.sca.CurrentModuleContext;
-import org.osoa.sca.ModuleContext;
-
-/**
- * Places an SCA service in the JSP page context, making it available to other tags corresponding to its id value.
- */
-
-public class ServiceTag extends TagSupport {
-
-    // ----------------------------------
-    // Constructors
-    // ----------------------------------
-
-    public ServiceTag() {
-        super();
-    }
-
-    // ----------------------------------
-    // Methods
-    // ----------------------------------
-
-    private String mName;
-
-    /**
-     * Returns the name of the SCA service to import into the page context.
-     */
-    public String getName() {
-        return mName;
-    }
-
-    /**
-     * Sets name of the SCA service to import into the page context.
-     */
-    public void setName(String pName) {
-        mName = pName;
-    }
-
-    private String mId;
-
-    /**
-     * Returns the id of the service in the page context
-     */
-    public String getId() {
-        return mId;
-    }
-
-    /**
-     * Sets the id of the service for the page context
-     */
-
-    public void setId(String pId) {
-        mId = pId;
-    }
-
-    public int doStartTag() throws JspException {
-        ModuleContext moduleContext = CurrentModuleContext.getContext();
-        Object service = moduleContext.locateService(mName);
-        if (service == null) {
-            throw new JspException("Service [" + mName + "] not found in current module context");
-        }
-        if (mId == null) {
-            // if the Id name was not specified, default to the basic name of the
-            // service
-            mId = mName;
-        }
-        pageContext.setAttribute(mId, service);
-        return EVAL_BODY_INCLUDE;
-    }
-
-    public int doEndTag() throws JspException {
-        return EVAL_PAGE;
-    }
-
-    public void release() {
-        super.release();
-    }
-}
-\ No newline at end of file
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java
deleted file mode 100644
index bad6d370b0..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/ui/FormServlet.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.ui;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.osoa.sca.CurrentModuleContext;
-import org.osoa.sca.ModuleContext;
-
-import bigbank.webclient.services.profile.ProfileService;
-
-import com.bigbank.account.AccountFactory;
-import com.bigbank.account.AccountService;
-import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.StockSummary;
-
-public class FormServlet extends HttpServlet {
-
-    // private ServletContext mContext;
-    // public void init(ServletConfig pCfg) throws ServletException {
-    // mContext = pCfg.getServletContext();
-    // }
-
-    public void doPost(HttpServletRequest pReq, HttpServletResponse pResp) throws ServletException {
-
-        try {
-            final String action = pReq.getParameter("action");
-            ModuleContext moduleContext = CurrentModuleContext.getContext();
-            AccountService accountServices = (AccountService) moduleContext.locateService("AccountServiceComponent");
-            if (accountServices == null) {
-                throw new ServletException("AccountServiceComponent");
-            }
-            ProfileService profileServices = null;
-            if (!"createAccount".equals(action)) {
-                profileServices = (ProfileService) moduleContext.locateService("ProfileServiceComponent");
-                if (profileServices == null) {
-                    throw new ServletException("ProfileServiceComponent not found.");
-                }
-                if (!profileServices.isLoggedIn()) {
-                    throw new ServletException("User id '" + profileServices.getId() + "' not logged on.");
-                }
-            }
-
-            if ("createAccount".equals(action)) {
-                createAccount(pReq, pResp, accountServices);
-            } else if ("account".equals(action)) {
-                accountTransaction(pReq, pResp, accountServices);
-            } else if ("stockPurchase".equals(action)) {
-                stockPurchase(pReq, pResp, profileServices, accountServices);
-            } else if ("stockSale".equals(action)) {
-                stockSale(pReq, pResp, profileServices, accountServices);
-            } else {
-                throw new IllegalArgumentException("Unknown action in Form servlet '" + action + "'.");
-            }
-            // mContext.getRequestDispatcher("summary.jsp").forward(pReq, pResp);
-            pResp.sendRedirect("summary.jsp");
-        } catch (ServletException e) {
-            e.printStackTrace();
-            throw e;
-
-        } catch (Exception e) {
-
-            throw new ServletException(e);
-        }
-
-    }
-
-    private void stockSale(HttpServletRequest req, HttpServletResponse resp, ProfileService profileServices, AccountService accountServices)
-            throws ServletException {
-        try {
-            if (!"cancel".equals(req.getParameter("cancel"))) {
-
-                int quantity = Integer.parseInt(req.getParameter("quantity"));
-                int purchaseLotNumber = Integer.parseInt(req.getParameter("purchaseLotNumber"));
-                accountServices.sellStock(purchaseLotNumber, quantity);
-            }
-
-        } catch (Exception e) {
-
-            throw new ServletException("stockSale " + e.getMessage(), e);
-        }
-
-    }
-
-    private void stockPurchase(HttpServletRequest req, HttpServletResponse resp, ProfileService profileServices, AccountService accountServices)
-            throws ServletException {
-        try {
-            if (!"cancel".equals(req.getParameter("cancel"))) {
-
-                String symbol = req.getParameter("symbol").trim().toUpperCase();
-                int quantity = Integer.parseInt(req.getParameter("quantity"));
-                StockSummary stockSummry = AccountFactory.INSTANCE.createStockSummary();
-                stockSummry.setSymbol(symbol);
-                stockSummry.setQuantity(quantity);
-                accountServices.purchaseStock(profileServices.getId(), stockSummry);
-            }
-        } catch (Exception e) {
-            throw new ServletException("stockPurchase " + e.getMessage(), e);
-        }
-    }
-
-    private void accountTransaction(HttpServletRequest req, HttpServletResponse resp, AccountService accountServices) throws ServletException {
-        try {
-            if (!"cancel".equals(req.getParameter("cancel"))) {
-                String account = req.getParameter("account");
-                String amount = req.getParameter("Amount");
-                if ("deposit".equals(req.getParameter("actionType")))
-                    accountServices.deposit(account, Float.parseFloat(amount));
-                else
-                    accountServices.withdraw(account, Float.parseFloat(amount));
-            }
-        } catch (Exception e) {
-            throw new ServletException("accountTransaction " + e.getMessage(), e);
-        }
-
-    }
-
-    private void createAccount(HttpServletRequest pReq, HttpServletResponse pResp, AccountService accountServices) throws ServletException {
-        try {
-            CustomerProfileData customerProfileData = AccountFactory.INSTANCE.createCustomerProfileData();
-            customerProfileData.setFirstName(pReq.getParameter("firstName"));
-            customerProfileData.setLastName(pReq.getParameter("lastName"));
-            customerProfileData.setAddress(pReq.getParameter("address"));
-            customerProfileData.setEmail(pReq.getParameter("email"));
-            customerProfileData.setLoginID(pReq.getParameter("loginID"));
-            customerProfileData.setPassword(pReq.getParameter("password"));
-
-            CustomerProfileData resp = accountServices.createAccount(customerProfileData, "savings".equals(pReq.getParameter("savings")), "checkings"
-                    .equals(pReq.getParameter("checkings")));
-            LoginServlet.login(resp.getLoginID(), resp.getPassword());
-
-        } catch (IOException e) {
-            throw new ServletException(e);
-        }
-
-    }
-}
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java
deleted file mode 100644
index 886f42a778..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/ui/LoginServlet.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.ui;
-
-import java.io.IOException;
-import java.rmi.RemoteException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.osoa.sca.CurrentModuleContext;
-import org.osoa.sca.ModuleContext;
-
-import bigbank.webclient.services.profile.LoginService;
-
-public class LoginServlet extends HttpServlet {
-
-    public void init(ServletConfig pCfg) throws ServletException {
-
-    }
-
-    public void doPost(HttpServletRequest pReq, HttpServletResponse pResp) throws ServletException {
-
-        if ("logout".equals(pReq.getParameter("logout")) || "logoutHIDDEN".equals(pReq.getParameter("logoutHIDDEN"))) {
-            HttpSession sess = pReq.getSession();
-            if (sess != null)
-                sess.invalidate();
-            try {
-                pResp.sendRedirect("login.html");
-            } catch (IOException e) {
-
-                e.printStackTrace();
-                throw new ServletException(e);
-            }
-
-        } else {
-
-            String login = pReq.getParameter("login");
-            String password = pReq.getParameter("password");
-            try {
-                int resp = login(login, password);
-                if (resp == LoginService.SUCCESS) {
-
-                    pResp.sendRedirect("summary.jsp");
-                } else {
-
-                    pResp.sendRedirect("login.html");
-                }
-            } catch (IOException e) {
-                throw new ServletException(e);
-            }
-        }
-    }
-
-    static int login(final String login, final String password) throws ServletException {
-
-        ModuleContext moduleContext = CurrentModuleContext.getContext();
-        LoginService loginMgr = (LoginService) moduleContext.locateService("LoginServiceComponent");
-
-        if (loginMgr == null) {
-            throw new ServletException("LoginManager not found");
-        }
-
-        try {
-            return loginMgr.login(login, password);
-        } catch (RemoteException e) {
-
-            throw new ServletException(e);
-        }
-
-    }
-
-}
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/resources/sca.module b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/resources/sca.module
deleted file mode 100644
index 05e3859587..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/resources/sca.module
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
-<module xmlns="http://www.osoa.org/xmlns/sca/0.9" xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
-	name="bigbank.webclient">
-
-    <import.sdo factory="com.bigbank.account.AccountFactory" />
-    
-    <import.wsdl wsdlLocation="wsdl/AccountService.wsdl"/>
-
-    <component name="LoginServiceComponent">
-        <implementation.java class="bigbank.webclient.services.profile.AccountLoginServiceImpl"/>
-        <references>
-            <v:accountService>AccountServiceComponent</v:accountService>
-            <v:profileService>ProfileServiceComponent</v:profileService>
-        </references>
-    </component>
-
-    <component name="ProfileServiceComponent">
-        <implementation.java class="bigbank.webclient.services.profile.ProfileServiceImpl"/>
-        <properties>
-            <v:firstName>Anonymous</v:firstName>
-        </properties>
-    </component>
-
-    <component name="AccountServiceComponent">
-        <implementation.java class="bigbank.webclient.services.account.AccountServiceComponentImpl"/>
-        <references>
-            <v:accountService>AccountService</v:accountService>
-        </references>
-    </component>
-
-    <externalService name="AccountService">
-        <interface.wsdl interface="http://www.bigbank.com/account#wsdl.interface(AccountService)"/>
-        <binding.ws port="http://www.bigbank.com/account#wsdl.endpoint(AccountService/AccountServiceSOAP)"/>
-    </externalService>
-
-</module>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/resources/sca.subsystem b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/resources/sca.subsystem
deleted file mode 100644
index c0b66ca4e7..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/resources/sca.subsystem
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
-<subsystem	xmlns="http://www.osoa.org/xmlns/sca/0.9" xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
-	name="sample-bigbank-webclient-subsystem">
-
-	<moduleComponent name="sample-bigbank-webclient" module="bigbank.webclient">
-		<references>
-			<v:AccountService>sample-bigbank-account-subsystem/sample-bigbank-account/AccountService</v:AccountService>
-		</references>	
-	</moduleComponent>
-
-</subsystem>
-	
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
deleted file mode 100644
index c44b826440..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-	
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
--->
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:account="http://www.bigbank.com/account"
-	targetNamespace="http://www.bigbank.com/account"
-	name="AccountService">
-
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://www.bigbank.com/account"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			xmlns:account="http://www.bigbank.com/account"
-			
-			> <!-- xmlns:sdojava="commonj.sdo/java" sdojava:package="org.apache.tuscany.samples.bigbank.account" -->
-			
-			
-	<xsd:complexType name="DataGraphRoot">		<!-- This was added temporarily for DAS 
-	                                                 changes are on the way to lift this requirement -->
-	 	<xsd:sequence>
-            <xsd:element name="customerProfileData" type="account:CustomerProfileData" maxOccurs="unbounded" minOccurs="0" />
-            <xsd:element name="StockSummaries" type="account:StockSummary" maxOccurs="unbounded" minOccurs="0" />
-            <xsd:element name="AccountSummaries" type="account:AccountSummary" maxOccurs="unbounded" minOccurs="0" />
-        </xsd:sequence>
-	</xsd:complexType>
-			
-
-			<xsd:element name="getAccountReport">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerID"
-							type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="getAccountReportResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountReport"
-							type="account:AccountReport" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="AccountReport">
-				<xsd:sequence>
-					<xsd:element name="accountSummaries"
-						type="account:AccountSummary" maxOccurs="unbounded" />
-					<xsd:element name="stockSummaries"
-						type="account:StockSummary" maxOccurs="unbounded" />
-						
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="AccountSummary">
-				<xsd:attribute name="accountNumber" type="xsd:string" />
-				<xsd:attribute name="accountType" type="xsd:string" />
-				<xsd:attribute name="balance" type="xsd:float" />
-			</xsd:complexType>
-
-			<xsd:complexType name="StockSummary">
-				<xsd:attribute name="purchaseLotNumber" type="xsd:int" />
-				<!-- unique id for this purchase -->
-				<xsd:attribute name="symbol" type="xsd:string" />
-				<xsd:attribute name="quantity" type="xsd:int" />
-				<xsd:attribute name="purchaseDate" type="xsd:dateTime" />
-				<xsd:attribute name="purchasePrice" type="xsd:float" />
-				<xsd:attribute name="currentPrice" type="xsd:float" />
-				<xsd:attribute name="company" type="xsd:string" />
-				<xsd:attribute name="highPrice" type="xsd:float" />
-				<xsd:attribute name="lowPrice" type="xsd:float" />
-				
-			</xsd:complexType>
-
-			<!-- Profile in data base  -->
-			<xsd:element name="getCustomerProfile">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="loginID" type="xsd:string" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:complexType name="CustomerProfileData">
-				<xsd:sequence>
-					<xsd:element name="firstName" type="xsd:string" />
-					<xsd:element name="lastName" type="xsd:string" />
-					<xsd:element name="address" type="xsd:string" />
-					<xsd:element name="email" type="xsd:string" />
-					<xsd:element name="loginID" type="xsd:string" />
-					<xsd:element name="password" type="xsd:string" />
-					<xsd:element name="id" type="xsd:int" />
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:element name="getCustomerProfileResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="withdraw">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="withdrawResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="deposit">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="accountNumber"
-							type="xsd:string" />
-						<xsd:element name="amount" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-			<xsd:element name="depositResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="balance" type="xsd:float" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="id" type="xsd:int" />
-						<xsd:element name="stock" type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="purchaseStockResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseSummary"
-							type="account:StockSummary" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-
-
-			<xsd:element name="sellStock">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="purchaseLotNumber"
-							type="xsd:int" /><!-- unique id for this purchase -->
-						<xsd:element name="quantity" type="xsd:int" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-
-			<xsd:element name="createAccount">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-                        <xsd:element name="createSavings"
-							type="xsd:boolean" />
-                        <xsd:element name="createCheckings"
-							type="xsd:boolean" />
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>	
-			<xsd:element name="createAccountResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="customerProfile"
-							type="account:CustomerProfileData" />
-					</xsd:sequence>
-				</xsd:complexType>
-				
-			</xsd:element>
-
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="getAccountReportRequest">
-		<wsdl:part element="account:getAccountReport"
-			name="getAccountReportRequest" />
-	</wsdl:message>
-	<wsdl:message name="getAccountReportResponse">
-		<wsdl:part element="account:getAccountReportResponse"
-			name="getAccountReportResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="getCustomerProfileRequest">
-		<wsdl:part element="account:getCustomerProfile"
-			name="getCustomerProfile" />
-	</wsdl:message>
-	<wsdl:message name="getCustomerProfileResponse">
-		<wsdl:part element="account:getCustomerProfileResponse"
-			name="getCustomerProfileResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawRequest">
-		<wsdl:part element="account:withdraw" name="withdrawRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="withdrawResponse">
-		<wsdl:part element="account:withdrawResponse"
-			name="withdrawResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="depositRequest">
-		<wsdl:part element="account:deposit" name="depositRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="depositResponse">
-		<wsdl:part element="account:depositResponse"
-			name="depositResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockRequest">
-		<wsdl:part element="account:purchaseStock"
-			name="purchaseStockRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="purchaseStockResponse">
-		<wsdl:part element="account:purchaseStockResponse"
-			name="purchaseStockResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="sellStockRequest">
-		<wsdl:part element="account:sellStock" name="sellStockRequest" />
-	</wsdl:message>
-	
-	<wsdl:message name="createAccountRequest">
-		<wsdl:part element="account:createAccount" name="createAccountRequest" />
-	</wsdl:message>
-
-	<wsdl:message name="createAccountResponse">
-		<wsdl:part element="account:createAccountResponse" name="createAccountResponse" />
-	</wsdl:message>
-
-	<wsdl:portType name="AccountService">
-		<wsdl:operation name="getAccountReport">
-			<wsdl:input message="account:getAccountReportRequest" />
-			<wsdl:output message="account:getAccountReportResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="getCustomerProfile">
-			<wsdl:input message="account:getCustomerProfileRequest" />
-			<wsdl:output message="account:getCustomerProfileResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<wsdl:input message="account:withdrawRequest" />
-			<wsdl:output message="account:withdrawResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<wsdl:input message="account:depositRequest" />
-			<wsdl:output message="account:depositResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<wsdl:input message="account:purchaseStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<wsdl:input message="account:sellStockRequest" />
-			<wsdl:output message="account:purchaseStockResponse" />
-		</wsdl:operation>
-
-
-		<wsdl:operation name="createAccount">
-			<wsdl:input message="account:createAccountRequest" />
-			<wsdl:output message="account:createAccountResponse" />
-		</wsdl:operation>
-
-	</wsdl:portType>
-
-
-
-	<wsdl:binding name="AccountServiceSOAP" type="account:AccountService">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="getAccountReport">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getAccountReport" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getCustomerProfile">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/getCustomerProfile" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="withdraw">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/withdraw" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="deposit">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/deposit" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="purchaseStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/purchaseStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="sellStock">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/sellStock" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-		<wsdl:operation name="createAccount">
-			<soap:operation
-				soapAction="http://www.bigbank.com/account/createAccount" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-
-	</wsdl:binding>
-	<wsdl:service name="AccountService">
-		<wsdl:port binding="account:AccountServiceSOAP"
-			name="AccountServiceSOAP">
-			<soap:address
-				location="http://localhost:8080/sample-bigbank-account/services/AccountService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/CustomerProfile.jsp b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/CustomerProfile.jsp
deleted file mode 100644
index 6fc0484056..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/CustomerProfile.jsp
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%--
-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- --%>
-
-<HTML>
-<HEAD>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<%-- LINK href="theme/Master.css" rel="stylesheet" type="text/css" --%>
-<TITLE>BigBank- Customer Account</TITLE>
-</HEAD>
-<BODY><P><FONT size="+1">Customer Account</FONT><BR>
-<BR>
-</P>
-<FORM method="post" action="FormServlet">
-<input type="hidden" name="action"    value='createAccount' />
-<TABLE border="0">
-	<TBODY>
-		<TR>
-			<TD>First name </TD>
-			<TD width="10%"></TD>
-			<TD><INPUT type="text" name="firstName" size="20"></TD>
-		</TR>
-		<TR>
-			<TD>Last name</TD>
-			<TD></TD>
-			<TD><INPUT type="text" name="lastName" size="20"></TD>
-		</TR>
-		<TR>
-			<TD>Address</TD>
-			<TD></TD>
-			<TD><INPUT type="text" name="address" size="36" maxlength="170"></TD>
-		</TR>
-		<TR>
-			<TD>email</TD>
-			<TD></TD>
-			<TD><INPUT type="text" name="email" size="16" maxlength="39"></TD>
-		</TR>
-		<TR>
-			<TD>&nbsp;</TD>
-			<TD></TD>
-			<TD></TD>
-		</TR>
-		<TR>
-			<TD>Checkings</TD>
-			<TD></TD>
-			<TD><INPUT type="checkbox" name="checkings" value="checkings" checked></TD>
-		</TR>
-		<TR>
-			<TD>Savings</TD>
-			<TD></TD>
-			<TD><INPUT type="checkbox" name="savings" value="savings" checked></TD>
-		</TR>
-		<TR>
-			<TD>&nbsp;</TD>
-			<TD></TD>
-			<TD></TD>
-		</TR>
-		<TR>
-			<TD>Logon ID</TD>
-			<TD></TD>
-			<TD><INPUT type="text" name="loginID" size="20"></TD>
-		</TR>
-		<TR>
-			<TD>Password</TD>
-			<TD></TD>
-			<TD><INPUT type="password" name="password" size="20"></TD>
-		</TR>
-		<TR>
-			<TD></TD>
-			<TD></TD>
-			<TD></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<BR>
-<INPUT type="submit" name="update" value="update">&nbsp;&nbsp;
-<INPUT type="button" name="cancel" value="cancel"></FORM>
-<P><BR>
-</P>
-</BODY>
-</HTML>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld
deleted file mode 100644
index 36554640cd..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/bigbank-tags.tld
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" version="2.0">
-    <tlibversion>1.0</tlibversion>
-    <jspversion>2.0</jspversion>
-    <shortname>BigBank Tags</shortname>
-    <info>Tag library containing BigBank tags</info>
-    <tag>
-        <name>service</name>
-        <tagclass>bigbank.webclient.tags.sca.ServiceTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-        <info>Places a reference to an SCA Service in the page context</info>
-        <attribute>
-            <name>id</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>login</name>
-        <tagclass>bigbank.webclient.tags.sca.LoginBarrierTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-        <info>Redirects if user is not logged in</info>
-        <attribute>
-            <name>profile</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>url</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-
-    </tag>
-    <tag>
-        <name>accountStatus</name>
-        <tagclass>bigbank.webclient.tags.account.AccountStatusTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-        <info>Accesses and iterates the account service</info>
-        <attribute>
-            <name>id</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>accountService</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>profileService</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-        <tag>
-        <name>stockStatus</name>
-        <tagclass>bigbank.webclient.tags.account.StockStatusTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-        <info>Accesses and iterates the stocks</info>
-        <attribute>
-            <name>id</name>
-            <required>true</required>
-            <rtexprvalue>false</rtexprvalue>
-        </attribute>
-    </tag>
-    
-
-</taglib>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 3b4c735a62..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- -->
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-    <display-name>Tuscany Bigbank Web UI sample</display-name>
-    <welcome-file-list id="WelcomeFileList">
-        <welcome-file>login.html</welcome-file>
-    </welcome-file-list>
-
-    <servlet>
-        <servlet-name>LoginServlet</servlet-name>
-        <servlet-class>bigbank.webclient.ui.LoginServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>FormServlet</servlet-name>
-        <servlet-class>bigbank.webclient.ui.FormServlet</servlet-class>
-        <load-on-startup>0</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>LoginServlet</servlet-name>
-        <url-pattern>/loginAction/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>FormServlet</servlet-name>
-        <url-pattern>/FormServlet/*</url-pattern>
-    </servlet-mapping>
-
-</web-app>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/accountTransaction.jsp b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/accountTransaction.jsp
deleted file mode 100644
index 4188b70b71..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/accountTransaction.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%--
-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- --%>
-
-<HTML>
-<HEAD>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM Software Development Platform">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>BigBank - <%=request.getParameter("account") %> </TITLE>
-</HEAD>
-<BODY>
-<P>Account <%=  request.getParameter("account") %><BR>
-<BR>
-<BR>
-</P>
-<FORM method="post" action="FormServlet">
-<input type="hidden" name="action"    value='account' />
-<input type="hidden" name="account"    value='<%=  request.getParameter("account") %>' />
-<input type="hidden" name="actionType"    value='<%=request.getParameter("transaction")%>' />
-Amount to <%=request.getParameter("transaction")%> <INPUT type="text" name="Amount" size="10"
-	maxlength="10"><BR>
-<BR>
-<BR>
-<BR>
-<INPUT type="submit" name="Submit"
-	value="Submit">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT type="submit"
-	name="cancel" value="cancel">
-</FORM>
-</BODY>
-</HTML>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/login.html b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/login.html
deleted file mode 100644
index 83f8fd3d2c..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/login.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<html>
-<title>Welcome to Big Bank</title>
-
-<body>
-
-<form action="loginAction" method="post">
-    <table>
-        <tr>
-            <td colspan="2">Please login in to access your account</td>
-        </tr>
-    </table>
-    <table>
-        <tr>
-            <td>Login</td>
-            <td><input type="text" name="login"/></td> 
-            <td><I><FONT
-			size="-1" color="red">(test)</FONT></I></td>
-        </tr>
-        <tr>
-            <td>Password</td>
-            <td><input type="password" name="password"/></td>
-            <td><I><FONT size="-1" color="red">(password)</FONT></I></td>
-        </tr>
-        <tr>&nbsp;<td></td>
-        <td align="right"><input type="submit"  name='login' value="login"/></td>
-        <tr>&nbsp;<td></td>
-        </tr>
-    </table>
-</form>
-<P><BR></P>
-<HR/>
-<FORM  action="CustomerProfile.jsp" method="get">
-<BR>New to Big Bank?  Please open a new account with us.
-<BR/>
-<P>
-<INPUT type="submit" name="createAccount" value="Create a new account">
-
-</FORM>
-
-
-</body>
-</html>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/purchaseStock.jsp b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/purchaseStock.jsp
deleted file mode 100644
index b0838a9a81..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/purchaseStock.jsp
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%--
-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- --%>
-
-<HTML>
-<HEAD>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<TITLE>BigBank- Stock purchase</TITLE>
-</HEAD>
-<BODY><P><FONT size="+1">Stock purchase</FONT><BR>
-<BR>
-</P>
-<FORM method="post" action="FormServlet">
-<input type="hidden" name="action"  value='stockPurchase' />
-<TABLE border="0">
-	<TBODY>
-		<TR>
-			<TD>Symbol </TD>
-			<TD width="10%"></TD>
-			<TD><INPUT type="text" name="symbol" size="6"></TD>
-		</TR>
-		<TR>
-			<TD>Quantity</TD>
-			<TD></TD>
-			<TD><INPUT type="text" name="quantity" size="6"></TD>
-		</TR>
-		<TR>
-			<TD></TD>
-			<TD></TD>
-			<TD></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<BR>
-<INPUT type="submit" name="purchase" value="purchase">&nbsp;&nbsp;
-<INPUT type="submit" name="cancel" value="cancel"></FORM>
-<P><BR>
-</P>
-</BODY>
-</HTML>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/stockSale.jsp b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/stockSale.jsp
deleted file mode 100644
index de4c438ffb..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/stockSale.jsp
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%--
-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- --%>
-
-<HTML>
-<HEAD>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<TITLE>BigBank- Stock sale</TITLE>
-</HEAD>
-<BODY><P><FONT size="+1">Stock sale</FONT><BR>
-<BR>
-</P>
-<FORM method="post" action="FormServlet">
-<input type="hidden" name="action"  value='stockSale' />
-<input type="hidden" name="purchaseLotNumber"  value='<%=request.getParameter("purchaseLotNumber")%>' />
-<TABLE border="0">
-	<TBODY>
-		
-		<TR>
-			<TD>Quantity</TD>
-			<TD></TD>
-			<TD><INPUT type="text" name="quantity" size="6"></TD>
-		</TR>
-		<TR>
-			<TD></TD>
-			<TD></TD>
-			<TD></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<BR>
-<INPUT type="submit" name="stockSale" value="sell">&nbsp;&nbsp;
-<INPUT type="submit" name="cancel" value="cancel"></FORM>
-<P><BR>
-</P>
-</BODY>
-</HTML>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/summary.jsp b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/summary.jsp
deleted file mode 100644
index 263ab9e1ac..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/main/webapp/summary.jsp
+++ /dev/null
@@ -1,136 +0,0 @@
-<%--
-  Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
- --%>
- 
- <%@ page import="com.bigbank.account.AccountSummary" %>
- <%@ page import="com.bigbank.account.StockSummary" %>
- <%@ page session="true" %>
- <%@ page autoFlush="true" %>
-<%@ taglib uri="/WEB-INF/bigbank-tags.tld" prefix="sca" %>
-<sca:login profile="ProfileServiceComponent" url="login.html">
-    <sca:service id="profile" name="ProfileServiceComponent"/>
-
-    <html>
-    <title>BigBank Account Summary</title>
-
-    <body>
-
-    Account Information for
-    <FORM method="post" action='loginAction'>
-    <jsp:getProperty name='profile' property='firstName'/>
-    <jsp:getProperty name='profile' property='lastName'/>
-    <input type="hidden" name="logoutHIDDEN"    value='logoutHIDDEN' />
-    &nbsp;&nbsp;<INPUT type="submit" name='logout' value="logout">
-    <br>
-    </FORM>
-    
-    <table>
-        <tr>
-            <td><strong>Account</strong></td>
-            <td>&nbsp;</td>
-            <td><strong>Balance</strong></td>
-        </tr>
-        <sca:accountStatus accountService="AccountServiceComponent" profileService="ProfileServiceComponent" id="account">
-        <tr>
-			<FORM method="post" action='accountTransaction.jsp'>
-			   <input type="hidden" name="account"    value='<%=((AccountSummary)pageContext.getAttribute("account")).getAccountNumber()%>' />
-            <td>
-                <jsp:getProperty name="account" property="accountNumber"/>
-            </td>
-            
-            <td>
-                <jsp:getProperty name="account" property="accountType"/>
-            </td>
-            <td>
-                <jsp:getProperty name="account" property="balance"/>
-            </td>
-            <td>
-           
-            <INPUT type="submit" name='transaction' value="deposit">
-            </td>
-            <td>
-            <INPUT type="submit" name='transaction' value="withdraw">
-            </td>
-			</FORM>           
-        </tr>
-        </sca:accountStatus>
-       </table>
- 
-       
-       
-       <hr/>
-       <FORM method="post" action='purchaseStock.jsp'>
-       Stocks: &nbsp;&nbsp;&nbsp;&nbsp;<INPUT type="submit" name='Purchase' value="Purchase"><br/>
-       </FORM>   
-       
-        <table>
-
-        <tr>
-            <td><strong>Symbol</strong></td>
-            <td><strong>Quantity</strong></td>
-            <td><strong>Purchase Date</strong></td>
-            <td>&nbsp;&nbsp;</td>  <%-- spacer --%>
-            <td><strong>Purchase Price</strong></td>
-            <td><strong>Current Price</strong></td>
-            <td><strong>Company Name</strong></td>
-            <td><strong>Today High</strong></td>
-            <td><strong>Today Low</strong></td>
-            <td>&nbsp;&nbsp;</td>  <%-- spacer --%>
-            <td> <%-- sell button --%></td> 
-        </tr>
-        <sca:stockStatus id="stocksummary">
-        <FORM method="post" action='stockSale.jsp' >        
-        <tr>
-            <td>
-                <jsp:getProperty name="stocksummary" property="symbol"/>
-            </td>
-            <td>
-                <jsp:getProperty name="stocksummary" property="quantity"/>
-            </td>
-            <td>
-                <jsp:getProperty name="stocksummary" property="purchaseDate"/>
-            </td>
-            <td>&nbsp;&nbsp;</td>  <%-- spacer --%>
-            <td>
-                <jsp:getProperty name="stocksummary" property="purchasePrice"/>
-            </td>
-            
-            <td>
-                <jsp:getProperty name="stocksummary" property="currentPrice"/>
-            </td>
-            <td>
-                <jsp:getProperty name="stocksummary" property="company"/>
-            </td>
-            
-            <td>
-                <jsp:getProperty name="stocksummary" property="highPrice"/>
-            </td>
-            <td>
-                <jsp:getProperty name="stocksummary" property="lowPrice"/>
-            </td>
-            <td>&nbsp;&nbsp;</td>  <%-- spacer --%>
-            <td>
-               <INPUT type="submit" name='stocksale' value="sell"><br/>
-               <input type="hidden" name="purchaseLotNumber"    value='<%=((StockSummary)pageContext.getAttribute("stocksummary")).getPurchaseLotNumber()%>' />
-             </td>
-        </tr>
-        </FORM>   
-        </sca:stockStatus>
-       </table>
-
-       
-    </body>
-    </html>
-</sca:login>
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java
deleted file mode 100644
index 5dbb56865f..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/test/java/bigbank/webclient/client/TestAccountService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.client;
-
-import java.util.List;
-
-import org.apache.tuscany.core.client.TuscanyRuntime;
-import org.osoa.sca.CurrentModuleContext;
-import org.osoa.sca.ModuleContext;
-import org.osoa.sca.SCA;
-
-import com.bigbank.account.AccountReport;
-import com.bigbank.account.AccountService;
-
-
-public class TestAccountService extends SCA {
-
-    public void start() {
-    }
-
-    public void stop() {
-    }
-
-    public static void main(String[] args) throws Exception {
-        TuscanyRuntime tuscany = new TuscanyRuntime("bigbank.webclient.testclient", null);
-        tuscany.start();
-        ModuleContext moduleContext = CurrentModuleContext.getContext();
-
-        AccountService accountService = (AccountService) moduleContext.locateService("AccountServiceComponent");
-
-        AccountReport report = accountService.getAccountReport(12345);
-        List summaries = report.getAccountSummaries();
-
-        System.out.println("retrieved " + summaries.size() + " summaries");
-
-        tuscany.stop();
-    }
-}
diff --git a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java b/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java
deleted file mode 100644
index 4d2f10a706..0000000000
--- a/tags/java-M1-20060518/java/sampleapps/bigbank/webclient/src/test/java/bigbank/webclient/client/TestLoginService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package bigbank.webclient.client;
-
-import org.osoa.sca.CurrentModuleContext;
-import org.osoa.sca.ModuleContext;
-import org.osoa.sca.SCA;
-
-import org.apache.tuscany.core.client.TuscanyRuntime;
-
-import bigbank.webclient.services.profile.LoginService;
-
-
-public class TestLoginService extends SCA {
-
-    public void start() {
-    }
-
-    public void stop() {
-    }
-
-    public static void main(String[] args) throws Exception {
-
-
-        TuscanyRuntime tuscany = new TuscanyRuntime("bigbank.webclient.testclient", null);
-        tuscany.start();
-        ModuleContext moduleContext = CurrentModuleContext.getContext();
-        LoginService loginService = (LoginService)
-                moduleContext.locateService("LoginServiceComponent");
-
-        if (loginService.login("test", "password") == LoginService.SUCCESS)
-            System.out.println("Success");
-        else
-            System.out.println("Failure");
-    }
-}