Fix to match structure of trunk/compliance

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

2 files changed, 15 insertions, 1 deletions

diff --git a/otest/newlayout/oasis-assembly-test-runner/pom.xml b/otest/newlayout/oasis-assembly-test-runner/pom.xml
index c3ac4d7010..9dbb41c0ae 100644
--- a/otest/newlayout/oasis-assembly-test-runner/pom.xml
+++ b/otest/newlayout/oasis-assembly-test-runner/pom.xml
@@ -162,6 +162,20 @@
                             </sources>

                         </configuration>

                     </execution>

+                    <execution>

+                        <id>add-test-resource</id>

+                        <phase>generate-sources</phase>

+                        <goals>

+                            <goal>add-test-resource</goal>

+                        </goals>

+                        <configuration>

+                            <resources>

+                                <resource>

+                                   <directory>src/main/resources</directory>

+                                </resource>

+                            </resources>

+                        </configuration>

+                    </execution>

                 </executions>

             </plugin>

 

diff --git a/otest/newlayout/oasis-assembly-test-runner/src/test/resources/oasis-sca-tests.properties b/otest/newlayout/oasis-assembly-test-runner/src/test/resources/oasis-sca-tests.properties
index e6aed5ad95..a4012f9ea2 100644
--- a/otest/newlayout/oasis-assembly-test-runner/src/test/resources/oasis-sca-tests.properties
+++ b/otest/newlayout/oasis-assembly-test-runner/src/test/resources/oasis-sca-tests.properties
@@ -28,5 +28,5 @@ org.oasis.sca.tests.assembly.runtime_bridge=org.apache.tuscany.sca.otest.Tuscany
 

 # The location of the contributions for the test suite

 # %1 represents the placement of the name of each contribution into the location URI

-org.oasis.sca.tests.assembly.contribution.location=../sca-assembly/%1/target/%1.zip

+org.oasis.sca.tests.assembly.contribution.location=./target/oasis-contributions/sca-assembly/%1/target/%1.zip