diff options
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/build-jar.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/build-jar.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-test/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java (renamed from branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-classloader/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-folder/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/java/calculator/CalculatorService.java (renamed from branches/sca-java-1.5/itest/contribution-folder/src/test/java/calculator/CalculatorService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite (renamed from branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar (renamed from branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar) | bin | 2131 -> 2131 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar (renamed from branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar) | bin | 3641 -> 3641 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository3/contribution.zip (renamed from branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository3/contribution.zip) | bin | 5478 -> 5478 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-composite/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/hello.composite (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/hello.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-java/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-java/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-resource/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-resource/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd (renamed from branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-composite/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-java/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-resource/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-resource/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/store.composite (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/store.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-import-export/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html (renamed from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-jee/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java (renamed from branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (renamed from branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear) | bin | 16071 -> 16071 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar) | bin | 10764 -> 10764 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear) | bin | 21310 -> 21310 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar) | bin | 10740 -> 10740 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar) | bin | 7711 -> 7711 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war) | bin | 16238 -> 16238 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war) | bin | 16209 -> 16209 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar) | bin | 16204 -> 16204 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear (renamed from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear) | bin | 16291 -> 16291 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/pom.xml (renamed from branches/sca-java-1.5/itest/contribution-multiple/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/Hello.java (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/Hello.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/HelloImpl.java (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/HelloImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite (renamed from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/pom.xml (renamed from branches/sca-java-1.5/itest/contribution/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddService.java (renamed from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddServiceImpl.java (renamed from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorClient.java (renamed from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorClient.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorService.java (renamed from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java (renamed from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideService.java (renamed from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideServiceImpl.java (renamed from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyService.java (renamed from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java (renamed from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractService.java (renamed from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractService.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java (renamed from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/resources/ContributionTest.composite (renamed from branches/sca-java-1.5/itest/contribution/src/main/resources/ContributionTest.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/Calculator.composite (renamed from branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/Calculator.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/sca-contribution.xml (renamed from branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java (renamed from branches/sca-java-1.5/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/test/resources/deployables/sample-calculator.jar (renamed from branches/sca-java-1.5/itest/contribution/src/test/resources/deployables/sample-calculator.jar) | bin | 26901 -> 26901 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/test/resources/repository/sample-calculator.jar (renamed from branches/sca-java-1.5/itest/contribution/src/test/resources/repository/sample-calculator.jar) | bin | 26901 -> 26901 bytes |
165 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/build-jar.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/build-jar.xml index 299ce6864f..299ce6864f 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/build-jar.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/build-jar.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/pom.xml index 91bdd5253d..91bdd5253d 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java index 814c38777a..814c38777a 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java index e4daf0ec02..e4daf0ec02 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java index e4b3bc7048..e4b3bc7048 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java index 698aa2aa5d..698aa2aa5d 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java index 1e87d59af1..1e87d59af1 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java index 9e01f00a79..9e01f00a79 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java index 2514928c10..2514928c10 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java index cdd12d589d..cdd12d589d 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java index 6f1f6b8730..6f1f6b8730 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml index 714d1826e1..714d1826e1 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml index 7f7dc969e2..7f7dc969e2 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml index 7f7dc969e2..7f7dc969e2 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml index 8a2bec308f..8a2bec308f 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml index c77c4c1c7e..c77c4c1c7e 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml index 210a68011f..210a68011f 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml index d118cceef9..d118cceef9 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml index d37b6659da..d37b6659da 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml index 77b28d9023..77b28d9023 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml index 8ec290a831..8ec290a831 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml index 1398416978..1398416978 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite index db1f0d34e7..db1f0d34e7 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite index 5be79b741a..5be79b741a 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType index a76fae8090..a76fae8090 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/pom.xml index 3ba3578065..3ba3578065 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java index 692f16f6f6..692f16f6f6 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java index 1ec7aaaa3a..1ec7aaaa3a 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java diff --git a/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java index b123951ef6..b123951ef6 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java diff --git a/branches/sca-java-1.5/itest/contribution-classloader/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/pom.xml index b89248a59d..b89248a59d 100644 --- a/branches/sca-java-1.5/itest/contribution-classloader/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-classloader/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-folder/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/pom.xml index 041b34ba47..041b34ba47 100644 --- a/branches/sca-java-1.5/itest/contribution-folder/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java index 9f9c15c14d..9f9c15c14d 100644 --- a/branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java index 98bbe3935a..98bbe3935a 100644 --- a/branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-folder/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/java/calculator/CalculatorService.java index a318cf50d9..a318cf50d9 100644 --- a/branches/sca-java-1.5/itest/contribution-folder/src/test/java/calculator/CalculatorService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/java/calculator/CalculatorService.java diff --git a/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite index ac88b2ac48..ac88b2ac48 100644 --- a/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite diff --git a/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml index 8b60ae590c..8b60ae590c 100644 --- a/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar Binary files differindex 7e4a7132a3..7e4a7132a3 100644 --- a/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar diff --git a/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar Binary files differindex 0e16e11b0b..0e16e11b0b 100644 --- a/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar diff --git a/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository3/contribution.zip b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository3/contribution.zip Binary files differindex b293aa4bcc..b293aa4bcc 100644 --- a/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository3/contribution.zip +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository3/contribution.zip diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-composite/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/pom.xml index ec66194a1d..ec66194a1d 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-composite/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java index e65422136f..e65422136f 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java index 5369c18497..5369c18497 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml index 3c14560a56..3c14560a56 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/hello.composite index 636b7111d9..636b7111d9 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/hello.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/hello.composite diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java index 72b77564d2..72b77564d2 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-java/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-java/pom.xml index 0afad82323..0afad82323 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-java/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-java/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java index 74d22ed830..74d22ed830 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml index dc33dfa560..dc33dfa560 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType index 5a14b41650..5a14b41650 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-resource/pom.xml index 7500ab6bcb..7500ab6bcb 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-resource/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-resource/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml index f11eacb416..f11eacb416 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html index 1ff281373a..1ff281373a 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/pom.xml index 5cecdb2af2..5cecdb2af2 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml index b7394ec14b..b7394ec14b 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl index 9b31363e1a..9b31363e1a 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl diff --git a/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd index d3c83b08c6..d3c83b08c6 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/pom.xml index 57475ada86..57475ada86 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java index 966f56d7d5..966f56d7d5 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java index 3d43290380..3d43290380 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java index 74d22ed830..74d22ed830 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml index 9f3f5be452..9f3f5be452 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl index 9b31363e1a..9b31363e1a 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd index d3c83b08c6..d3c83b08c6 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite index e2f852ff7e..e2f852ff7e 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java index 1176a89143..1176a89143 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-java/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/pom.xml index 6f07701906..6f07701906 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-java/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java index 4cdcc1fd0b..4cdcc1fd0b 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml index 224e2c4d79..224e2c4d79 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite index 9b650e4acc..9b650e4acc 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java index 431988cc04..431988cc04 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-resource/pom.xml index 8c7aa5aef6..8c7aa5aef6 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-resource/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-resource/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml index ac6d7becb3..ac6d7becb3 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/store.composite index bb5a7b764f..bb5a7b764f 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/store.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/store.composite diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java index 1b7542b7d9..1b7542b7d9 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/pom.xml index 3521b0385d..3521b0385d 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java index 4cdcc1fd0b..4cdcc1fd0b 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java index 3d43290380..3d43290380 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java index 74d22ed830..74d22ed830 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml index d46fe0b57c..d46fe0b57c 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite index 5008a2ea5b..5008a2ea5b 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite diff --git a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java index 5c40606e50..5c40606e50 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-import-export/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/pom.xml index e292cdb5ea..e292cdb5ea 100644 --- a/branches/sca-java-1.5/itest/contribution-import-export/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-import-export/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml index cb95efffae..cb95efffae 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite index fa9a66af7f..fa9a66af7f 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml index 59a752bb28..59a752bb28 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml index ad932465cc..ad932465cc 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java index 0194d1870c..0194d1870c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java index 1bf293ec85..1bf293ec85 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml index 7428735903..7428735903 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml index 4c1e470270..4c1e470270 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml index 50811b3bd1..50811b3bd1 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java index 0194d1870c..0194d1870c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java index 6f37c9b272..6f37c9b272 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java index a38c4a773f..a38c4a773f 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite index c847c24c57..c847c24c57 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml index 2891ca81ee..2891ca81ee 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java index 0194d1870c..0194d1870c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java index 6f37c9b272..6f37c9b272 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java index a38c4a773f..a38c4a773f 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite index 068b92dab8..068b92dab8 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml index b341d6819a..b341d6819a 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java index ae8613f8db..ae8613f8db 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java index 0194d1870c..0194d1870c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml index 2563c8b7c8..2563c8b7c8 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite index 29898fe006..29898fe006 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml index 628588a974..628588a974 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html index 69473543c9..69473543c9 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml index fbb166ddd6..fbb166ddd6 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java index 71055bbdfe..71055bbdfe 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java index 0194d1870c..0194d1870c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml index 2563c8b7c8..2563c8b7c8 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml index 628588a974..628588a974 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html index 69473543c9..69473543c9 100644 --- a/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html diff --git a/branches/sca-java-1.5/itest/contribution-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/pom.xml index e13d292a28..e13d292a28 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java index eda6aad177..eda6aad177 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver index a39171507c..a39171507c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java index b81f67c287..b81f67c287 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java index 3674dc2638..3674dc2638 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java index 24556f0a4c..24556f0a4c 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java index a59c6839fe..a59c6839fe 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear Binary files differindex 11d2a029ec..11d2a029ec 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar Binary files differindex a5b160c875..a5b160c875 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear Binary files differindex 9fb1ed9d14..9fb1ed9d14 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar Binary files differindex 3a704137ed..3a704137ed 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar Binary files differindex 228f4d27d7..228f4d27d7 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war Binary files differindex 0b75db2745..0b75db2745 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war Binary files differindex 938ea75941..938ea75941 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar Binary files differindex 24f55a5f63..24f55a5f63 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar diff --git a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear Binary files differindex c912e64237..c912e64237 100644 --- a/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear diff --git a/branches/sca-java-1.5/itest/contribution-multiple/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/pom.xml index 9fc03558ae..9fc03558ae 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/Hello.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/Hello.java index 7e574a7db3..7e574a7db3 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/Hello.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/Hello.java diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/HelloImpl.java index ff9f6e75f3..ff9f6e75f3 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/HelloImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/HelloImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java index c062afaed0..c062afaed0 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java index 5251fc0a45..5251fc0a45 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java index ec5123eb2d..ec5123eb2d 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java index 133c98f357..133c98f357 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java index 790b6fed98..790b6fed98 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml index 8b76783c3d..8b76783c3d 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite index aeeab337fa..aeeab337fa 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml index bfbf74373a..bfbf74373a 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite index 7a8003577e..7a8003577e 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml index bea6f39932..bea6f39932 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite index aeeab337fa..aeeab337fa 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml index bfbf74373a..bfbf74373a 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite index 45cb504ea4..45cb504ea4 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml index cbabdcd4fc..cbabdcd4fc 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite index 4c9225de34..4c9225de34 100644 --- a/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite diff --git a/branches/sca-java-1.5/itest/contribution/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/pom.xml index 9dbc6518ac..9dbc6518ac 100644 --- a/branches/sca-java-1.5/itest/contribution/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/pom.xml diff --git a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddService.java index 4e72f92fda..4e72f92fda 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddService.java diff --git a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddServiceImpl.java index e9c635e3c8..e9c635e3c8 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddServiceImpl.java diff --git a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorClient.java index 719ad69eef..719ad69eef 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorClient.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorClient.java diff --git a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorService.java index f288af0174..f288af0174 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorService.java diff --git a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java index ae4ed12b7b..ae4ed12b7b 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java diff --git a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideService.java index ad99418f5b..ad99418f5b 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideService.java diff --git a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideServiceImpl.java index 8c33862f6d..8c33862f6d 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideServiceImpl.java diff --git a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyService.java index 3987b0a54f..3987b0a54f 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyService.java diff --git a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java index c7fbc73c00..c7fbc73c00 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java diff --git a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractService.java index 25e0ed6ca7..25e0ed6ca7 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractService.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractService.java diff --git a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java index 1a7f145ad8..1a7f145ad8 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java diff --git a/branches/sca-java-1.5/itest/contribution/src/main/resources/ContributionTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/resources/ContributionTest.composite index d814e439e2..d814e439e2 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/resources/ContributionTest.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/resources/ContributionTest.composite diff --git a/branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/Calculator.composite index 657a2f95d8..657a2f95d8 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/Calculator.composite +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/Calculator.composite diff --git a/branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/sca-contribution.xml index e95796d83a..e95796d83a 100644 --- a/branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/sca-contribution.xml diff --git a/branches/sca-java-1.5/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java index 97b2e5d6ed..97b2e5d6ed 100644 --- a/branches/sca-java-1.5/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java diff --git a/branches/sca-java-1.5/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/test/resources/deployables/sample-calculator.jar Binary files differindex 0ca3a1b781..0ca3a1b781 100644 --- a/branches/sca-java-1.5/itest/contribution/src/test/resources/deployables/sample-calculator.jar +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/test/resources/deployables/sample-calculator.jar diff --git a/branches/sca-java-1.5/itest/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/test/resources/repository/sample-calculator.jar Binary files differindex 0ca3a1b781..0ca3a1b781 100644 --- a/branches/sca-java-1.5/itest/contribution/src/test/resources/repository/sample-calculator.jar +++ b/sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/test/resources/repository/sample-calculator.jar |