Tidying up the README and profiles for the otests

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

2 files changed, 59 insertions, 34 deletions

diff --git a/otest/newlayout/README b/otest/newlayout/README
index f6d48e258a..ae38cbcbd8 100644
--- a/otest/newlayout/README
+++ b/otest/newlayout/README
@@ -3,20 +3,30 @@ Running the otests with Tuscany using Maven
 
 To get the OASIS compliance tests from SVN:
 
-svn co https://svn.apache.org/repos/asf/tuscany/java/sca/otest/newlayout/ otests
+svn co https://svn.apache.org/repos/asf/tuscany/otest/newlayout/ otest
 
 To run the tests:
 
-cd otest/newlayout
+cd otest
 mvn
 
-should build and run all of the Assembly spec otests
+should build and run all of the spec otests
+
+To run specific spec otests, the following profiles are available 
+
+assembly : Run all Assembly spec otests
+scajcaa  : Run all SCA-J CAA spec otests
+scajci   : Run all SCA-J CI spec otests
+scapolicy: Run all Policy spec otests
 
-mvn -Pscajcaa
+To run a specific profile, use:
 
-should build and run all of the SCA-J CAA spec otests
+mvn -P<profile name>
+mvn -Passembly
+
+should build and run all of the Assembly spec otests
 
-The file otest\newlayout\tuscany-test-runner\src\test\resources\oasis-sca-tests.properties configures the 
+The file tuscany-test-runner\src\test\resources\oasis-sca-tests.properties configures the 
 test environment. Currently you can run in either the Java standalone or OSGi runtimes
 which is configured by the org.oasis.sca.tests.assembly.runtime_bridge property.
 
@@ -25,12 +35,12 @@ Running the otests with Tuscany using Eclipse
 
 For the Assembly tests:
 
-cd otest/newlayout
+cd otest
 mvn eclipse:eclipse
 
-import otest/newlayout/tuscany-test-runner into eclipse (tuscany-otests-asm-tests)
-import otest/newlayout/sca-assembly/General into eclipse (General)
-import otest/newlayout/sca-assembly/General_Java into eclipse (General_Java)
+import tuscany-test-runner into eclipse (tuscany-otests-asm-tests)
+import sca-assembly/General into eclipse (General)
+import sca-assembly/General_Java into eclipse (General_Java)
 
 import which ever other contributions you need into eclipse (depends on which tests you are running)
   
@@ -38,9 +48,22 @@ For the SCA-J CAA tests:
 
 mvn -Pscajcaa eclipse:eclipse
 
-import otest/newlayout/tuscany-java-caa-test-runner into eclipse
-import otest/newlayout/sca-java-caa into eclipse
+import tuscany-java-caa-test-runner into eclipse
+import sca-java-caa into eclipse
+
+For the SCA-J CI tests:
+
+mvn -Pscajci eclipse:eclipse
+
+import tuscany-java-ci-test-runner into eclipse
+import sca-java-ci into eclipse
+
+For the Policy tests:
+
+mvn -Ppolicy eclipse:eclipse
 
+import tuscany-policy-test-runner into eclipse
+import sca-java-policy into eclipse
 
 
 Structure of the otests
@@ -49,11 +72,15 @@ Structure of the otests
 The otest directory, once checked out, contains files from both OASIS and Tuscany svn. As follows
 
 otest/
-  newlayout/                      - the latest otests
-    tuscany-test-runner           - the tuscany specific code + code copied from sca-assembly/Test_Client
-    sca-assembly/                 - the Assembly otest source pulled directly from OASIS svn via svn:externals
-    sca-java-caa/                 - the SCA-J CAA otest source pulled directly from OASIS svn via svn:externals
-    tuscany-java-caa-test-runner  - the tuscany specific code + code for running the SCA-J CAA tests
+  newlayout/                        - the latest otests
+    sca-assembly/                   - the Assembly otest source pulled directly from OASIS svn via svn:externals
+    sca-java-caa/                   - the SCA-J CAA otest source pulled directly from OASIS svn via svn:externals
+    sca-java-ci/                    - the SCA-J CI otest source pulled directly from OASIS svn via svn:externals
+    sca-java-policy/                - the SCA-J Policy otest source pulled directly from OASIS svn via svn:externals
+    tuscany-test-runner             - the tuscany specific code + code copied from sca-assembly/Test_Client
+    tuscany-java-caa-test-runner    - the tuscany specific code + code for running the SCA-J CAA tests
+    tuscany-java-ci-test-runner     - the tuscany specific code + code for running the SCA-J CI tests
+    tuscany-java-policy-test-runner - the tuscany specific code + code for running the SCA-J CI tests
 
 The Junit test cases are copied, using an ant script called by maven, from sca-assembly/Test_Client
 into tuscany-test-runner so that we can overlay them with Tuscany specific bridges and property
diff --git a/otest/newlayout/pom.xml b/otest/newlayout/pom.xml
index a33806aeee..54996d8e99 100644
--- a/otest/newlayout/pom.xml
+++ b/otest/newlayout/pom.xml
@@ -23,7 +23,6 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
         <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tuscany-otests</artifactId>
     <name>OASIS SCA Specification Tests</name>
@@ -69,7 +68,21 @@
 	
     <profiles>
         <profile>
-            <id>default</id>
+            <id>all</id>
+            <modules>
+                <module>sca-assembly</module>
+                <module>tuscany-test-runner</module>
+                <module>sca-java-caa</module>
+                <module>tuscany-java-caa-test-runner</module>
+                <module>sca-java-ci</module>
+                <module>tuscany-java-ci-test-runner</module>
+                <module>sca-policy</module>
+                <module>tuscany-policy-test-runner</module>
+            </modules>
+        </profile>
+    
+        <profile>
+            <id>assembly</id>        
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -102,21 +115,6 @@
                 <module>tuscany-policy-test-runner</module>
             </modules>
         </profile>
-
-        <profile>
-            <id>all</id>
-            <modules>
-                <module>sca-assembly</module>
-                <module>tuscany-test-runner</module>
-                <module>sca-java-caa</module>
-                <module>tuscany-java-caa-test-runner</module>
-                <module>sca-java-ci</module>
-                <module>tuscany-java-ci-test-runner</module>
-                <module>sca-policy</module>
-                <module>tuscany-policy-test-runner</module>
-            </modules>
-        </profile>
-
     </profiles>
 
 </project>