Tidy up dependencies, update all err message so row/column is *** as it moves around with different XML parsers

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

3 files changed, 15 insertions, 220 deletions

diff --git a/sca-java-2.x/trunk/compliance-tests/java-ci/pom.xml b/sca-java-2.x/trunk/compliance-tests/java-ci/pom.xml
index 6916af7860..c39fea6b2e 100644
--- a/sca-java-2.x/trunk/compliance-tests/java-ci/pom.xml
+++ b/sca-java-2.x/trunk/compliance-tests/java-ci/pom.xml
@@ -26,67 +26,34 @@
         <relativePath>../pom.xml</relativePath>

     </parent>

     <artifactId>tuscany-compliance-test-java-ci</artifactId>

-    <name>Apache Tuscany SCA Specification Compliance Tests Java Client Implementation</name>

+    <name>Apache Tuscany SCA Specification Compliance Tests Java CI</name>

 

     <dependencies>

 

         <dependency>

+            <!-- This is only needed to get the module working in Eclipse which doesn't pick it up from the dependency plugin unpack -->

+            <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>2.0-SNAPSHOT</version>

+            <artifactId>oasis-javaci-test-runner</artifactId>

+            <version>1.0-SNAPSHOT</version>

         </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-deployment</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl-osgi</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>        

 

         <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher-equinox</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency> 

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

+            <groupId>org.apache.tuscany.sca.shades</groupId>

+            <artifactId>tuscany-base</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

+            <groupId>org.apache.tuscany.sca.shades</groupId>

+            <artifactId>tuscany-webservices</artifactId>

             <version>2.0-SNAPSHOT</version>

         </dependency>

-        

-         <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>2.0-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.5</version>

-        </dependency>

 

         <dependency>

-            <groupId>com.sun.xml.ws</groupId>

-            <artifactId>jaxws-rt</artifactId>

-            <version>2.1.7</version>

+            <groupId>org.mortbay.jetty</groupId>

+            <artifactId>jetty</artifactId>

+            <version>6.1.19</version>

         </dependency>

 

         <dependency>

@@ -98,8 +65,6 @@
 

     </dependencies>

 

-

-

   <build>

     <finalName>${artifactId}</finalName>

     <plugins>

diff --git a/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/java/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java b/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/java/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java
deleted file mode 100644
index 606d120951..0000000000
--- a/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/java/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.otest;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.fail;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.Properties;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.equinox.launcher.Contribution;

-import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper;

-import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;

-

-import client.RuntimeBridge;

-import client.TestConfiguration;

-

-

-/**

- * An implementation of the Runtime Bridge for the Apache Tuscany SCA runtime (version 2.x)

- *

- */

-public class TuscanyOSGiRuntimeBridge implements RuntimeBridge {

-

-    static final String CONTRIBUTION_LOCATION_PROPKEY = "OASIS_TESTENV_CONTRIBUTION_LOCATION";

-

-    protected NodeLauncher launcher;

-    protected Node node;

-    TestConfiguration testConfiguration = null;

-    protected Properties expectedErrorMessages;

-

-    public TuscanyOSGiRuntimeBridge() {

-        // read test error mapping

-        expectedErrorMessages = new Properties();

-        try {

-            InputStream propertiesStream = this.getClass().getResourceAsStream("/tuscany-oasis-sca-tests-errors.properties");

-            expectedErrorMessages.load(propertiesStream);

-        } catch (IOException e) {   

-            System.out.println("Unable to read oasis-sca-tests-errors.properties file");

-        } 

-    }

-

-    public TestConfiguration getTestConfiguration() {

-        return testConfiguration;

-    }

-

-    public void setTestConfiguration(TestConfiguration testConfiguration) {

-        this.testConfiguration = testConfiguration;

-    }

-

-    public boolean startContribution(String contributionLocation, String[] contributionNames) throws Exception {

-        try {

-            // Tuscany specific code which starts the contribution(s) holding the test

-            launcher = NodeLauncher.newInstance();

-

-            Contribution[] contributions = new Contribution[contributionNames.length];

-            String[] contributionURIs = getContributionURIs(contributionLocation);

-            for (int i = 0; i < contributions.length; i++) {

-                contributions[i] = new Contribution(contributionNames[i], contributionURIs[i]);

-            } // end for

-

-            node = launcher.createNode(testConfiguration.getComposite(), contributions);

-            System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader());

-            // Start the node

-            node.start();

-        } catch (Exception e) {

-            System.out.println(e.getMessage());

-            e.printStackTrace();

-            throw e;

-        } // end try

-

-        return true;

-    } // end method startContribution

-

-    /**

-     * Gets the location of the Contributions as URIs

-     * @param contributionLocation - a location pattern URI, which contains one or more "%1"

-     * substrings, which are substituted with the name of the contribution to get the URI of

-     * the contribution

-     * @return the contribution locations as an array of Strings

-     */

-    protected String[] getContributionURIs(String contributionLocation) throws Exception {

-        String[] locations;

-        locations = testConfiguration.getContributionNames();

-

-        if (locations != null && contributionLocation != null) {

-

-            for (int i = 0; i < locations.length; i++) {

-                String aLocation = contributionLocation.replaceAll("%1", locations[i]);

-

-                locations[i] = aLocation;

-            } // end for    	  	

-        } else {

-            if (locations == null) {

-                // No contribution specified - throw an Exception

-                throw new Exception("Unable to start SCA runtime - no contribution supplied - error");

-            } else {

-                // No contribution location supplied - throw an Exception

-                throw new Exception("Unable to start SCA runtime - no contribution location supplied - error");

-            } // end if 

-        } // end if

-

-        return locations;

-    } // end getContributionURI

-

-    public void stopContribution() {

-        if (node != null) {

-            node.stop();

-        } // end if

-        if (launcher != null) {

-            launcher.destroy();

-        } // end if

-    } // end method stopContribution

-

-    public String getContributionLocation(Class<?> testClass) {

-        return ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass());

-    } // end method getContributionLocation

-    

-    public void checkError(String testName, Throwable ex) throws Throwable {       

-        String expectedMessage = expectedErrorMessages.getProperty(testName);

-        String receivedMessage = ex.getMessage();

-        

-        if (expectedMessage == null){

-            fail("Null expected error message for test " + testName + 

-                 "Please add message to oasis-sca-tests-errors.properties");

-        }

-        

-        if (receivedMessage == null){

-            fail("Null received error message for test " + testName);

-        }

-        

-        int messageStart = receivedMessage.indexOf("] - ");

-        

-        if (messageStart < 0){

-            fail("Message separator not found for test " + testName);

-        }

-        

-        receivedMessage = receivedMessage.substring(messageStart + 4);

-        

-        assertEquals( expectedMessage, receivedMessage );

-        

-        return;

-    }

-

-	public boolean startContribution(String compositeName,

-			String contributionLocation, String[] contributionNames)

-			throws Exception {

-		// TODO Auto-generated method stub

-		return false;

-	}   

-

-} // end class TuscanyRuntimeBridge

diff --git a/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
index f7c29a83f8..f4bb253219 100644
--- a/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
+++ b/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
@@ -18,12 +18,12 @@ POJO_2003=org.apache.tuscany.sca.contribution.processor.ContributionResolveExcep
 POJO_5001=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.NoConstructorException: No public constructor for class

 POJO_5005=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.AmbiguousConstructorException:

 POJO_5006=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicateConstructorException: Multiple constructors marked with @Constructor

-POJO_5007=org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidConstructorException: Multiple annotated constrictors

-POJO_8002=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TEST_POJO_8002Component1] - Component service interface incompatible with implementation service interface: Component = TEST_POJO_8002Component1 Service = Service1Superset Operation not found on target

+POJO_5007=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidConstructorException: Multiple annotated constructors

+POJO_8002=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TEST_POJO_8002Component1] - [ASM50004] Component service interface incompatible with implementation service interface: Component = TEST_POJO_8002Component1 Service = Service1Superset Operation not found on target

 POJO_8008=* unknown

 POJO_8013=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicatePropertyException: duplicateProperty

 POJO_8014=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicateReferenceException: duplicateReference

-POJO_9001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: POJO_9001, Artifact: Test_POJO_9001.composite] - XMLSchema validation error occured in: Test_POJO_9001.composite ,line = 30, column = 9, Message = cvc-complex-type.3.2.2: Attribute 'interface' is not allowed to appear in element 'implementation.java'.

+POJO_9001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: POJO_9001, Artifact: Test_POJO_9001.composite] - XMLSchema validation error occured in: Test_POJO_9001.composite ,line = ***, column = ***, Message = cvc-complex-type.3.2.2: Attribute 'interface' is not allowed to appear in element 'implementation.java'.

 POJO_10001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: POJO_10001, Artifact: META-INF/sca-contribution.xml] - The value of the @package attribute on the <import.java/> element is not unique across all other <import.java/> elements within the contribution.

 POJO_10004=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: [JCI100007] A Java package org.oasisopen.sca.test;version=1.0.0 that is specified on an export element MUST be contained within the contribution containing the export element.

 POJO_10005=org.oasisopen.sca.ServiceRuntimeException: [Contribution: POJO_10005, Artifact: META-INF/sca-contribution.xml] - The value of the @package attribute on the <export.java/> element is not unique across all other <export.java/> elements within the contribution.