2 files changed, 8 insertions, 125 deletions
diff --git a/sca-java-2.x/trunk/samples/README b/sca-java-2.x/trunk/samples/README
index d7b0f1eb5d..37e4d228a9 100644
--- a/sca-java-2.x/trunk/samples/README
+++ b/sca-java-2.x/trunk/samples/README
@@ -1,12 +1,14 @@
 The Apache Tuscany SCA Samples
 ==============================
 
-Structure
----------
+New Samples Structure
+---------------------
+
 For the Milestone 5 release of Tuscany SCA Java 2.x we are beginning
 the process of moving to a new structure for samples. Milestone 5 is 
 delivered in a state of partial change over to this new emphasis, and hence
-this README reflects that hybrid state.
+this README reflects that hybrid state. The individual READMEs at the root of any given sample
+gives an indication whether the sample is in the old or the new style.
 
 There are primarily 3 types of sample; those which focus on pure SCA
 concepts, those which demonstrate features of Tuscany and the last group
@@ -41,128 +43,8 @@ To run a new style sample there are 3 basic steps
 
 [1] http://tuscany.apache.org/documentation-2x/
 
-
-SCA Samples
-  binding-ws-calculator 
-  binding-ws-sdo-helloworld
-  binding-sca-calculator
-  binding-rmi-calculator
-    binding-rmi-calculator-reference
-    binding-rmi-calculator-service
-  helloworld
-  implementation-java-calculator
-  implementation-java-helloworld
-  implementation-bpel-helloworld
-  implementation-spring-helloworld
-  scaclient-helloworld
-Tuscany Samples
-  osgi-bundle-calculator  E, F?
-  dosgi-calculator
-    dosgi-calculator
-    dosgi-calculator-operations
-  dosgi-dynamic-calculator
-    dosgi-dynamic-calculator
-    dosgi-dynamic-calculator-operations
-  webapp-calculator G?
-Application Samples
-  store
-  store-webapp
-Launchers
-  launcher-embedded-jse  Ca, Da
-  launcher-embedded-osgi Cb, Db, F?
-  launcher-command-line  A
-  launcher-sca-client
-  launcher-eclipse - I what's this? Just embedded-jse with eclipse project files provided? Do we need this?
-
-
-1/ Use local SCAClient
-2/ Use remote SCAClient and distributed domain
-3/ Use interoperable binding
-
-Launch Mechanisms
------------------
-
-A. running a contribution from the command line
-  Command:   tuscany.bat/.sh
-  Classpath: core, extension and dependency jars
-
-B. running a contribution from Maven
-  Command:   Maven Tuscany plugin with mvn truscany:run
-  Classpath: Maven dependency on core + extension features
-
-Ca. running a contribution from Ant (JSE)
-  Command:   call tuscany.bat/.sh launcher directly
-  Classpath: core, extension and dependency jars
-
-Cb. running a contribution from Ant (OSGi)
-  Command:   tuscany-sca-equinox-manifest.jar
-  Classpath: sca-api, node-api, node-launcher-equinox - TBD
-
-Da. running a contribution from JSE program (or JUnit) (JSE)
-  Command:   org.apache.tuscany.sca.node.launcher.NodeLauncher.createNode(...).start()
-  Classpath: core, extension and dependency jars
-
-Db. running a contribution from JSE program (or JUnit) (OSGi)
-  Command:   org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher.createNode(...).start()
-  Classpath: sca-api, node-api, node-launcher-equinox - TBD
-
-E. running a contribution from Junit under OSGi in Maven
-  Command:   Maven Tuscany OSGi JUnit plugin
-  Classpath: maven dependency on features
-
-F. running a contribution from OSGi
-  Command:   Package contribution as a bundle that has an activator
-that uses pattern D
-  Classpath: Load the OSGi runtime (Equinox) with
-features/configuration/config.ini
-
-Ga. running a contribution from a webapp (.war as contribution)
-  Command:   web.xml configured to specify filter
-
- <filter>
-   <filter-name>tuscany</filter-name>
-   <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
- </filter>
-
-  Classpath: core, extension and dependency jars
-
-Gb. running a contribution from a webapp (contributions inside war)
-  Command:  web.xml configured to specify filter
-
- <context-param>
-   <param-name>contributions</param-name>
-   <param-value>/WEB-INF/sca-contributions</param-value>
- </context-param>
-
- <filter>
-   <filter-name>tuscany</filter-name>
-   <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
- </filter>
-
-  Classpath: core, extension and dependency jars
-
-H. running a contribution from Tomcat
-  Command:   install tomcat.war, from there install integration
-             I don't remember how contributions are installed.
-  Classpath: pakaged as part of deep integration
-  DEFER
-
-I. running a contribution from eclipse (or any other IDE)
-  Command:   No point and click tool in 2.x for eclipse yet
-             Use Da or Db
-  Classpath:
-  DEFER
-
-Developing Tuscany
-------------------
-
-J. Developing Tuscany and/or extensions in Eclipse
-
-K. Developing Tuscany and/or extensions in Eclipse PDE
-
-
-OLD STUFF
-=========
+Running the Old Style Samples
+------------------------------
 The Apache Tuscany SCA samples are built as part of the main Maven build and 
 run, using the provided JUnit test cases, as tests in the Maven build.
 
diff --git a/sca-java-2.x/trunk/samples/binding-sca/README b/sca-java-2.x/trunk/samples/binding-sca/README
new file mode 100644
index 0000000000..18ba62d494
--- /dev/null
+++ b/sca-java-2.x/trunk/samples/binding-sca/README
@@ -0,0 +1 @@
+Please look at the README files in the subdirectories of this directory for descriptions of the sample contributions.