diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/README b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/README
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/alert-aggregator.png b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/alert-aggregator.png
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/alert-aggregator.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/alert-aggregator.png
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/alert-aggregator.svg b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/alert-aggregator.svg
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/alert-aggregator.svg
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/alert-aggregator.svg
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/build-dojo.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/build-dojo.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/build-dojo.xml
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/build.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/build.xml
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/pom.xml
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/Alerts.wsdl
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/Alerts.xsd
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/AlertsSources.wsdl
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/alerts-client.composite
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/alerts.composite b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/alerts.composite
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/sources.xml b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/sources.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/sources.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/resources/sources.xml
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/AlertAggregator.html
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/pop.png b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/pop.png
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/pop.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/pop.png
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/rss.png b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/rss.png
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/rss.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/rss.png
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/service.smd b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/service.smd
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/service.smd
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/service.smd
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/sources.smd b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/sources.smd
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/style.css
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/style.css
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/main/webapp/style.css
diff --git a/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java b/sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
similarity index 100%
rename from branches/sca-java-1.5/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/alert-aggregator-webapp/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsIntegrationTest.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/README b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/README
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/README
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/README
diff --git a/branches/sca-java-1.5/demos/bigbank-account/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/build-dojo.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/build-dojo.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/build-dojo.xml
diff --git a/branches/sca-java-1.5/demos/bigbank-account/build.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/build.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/build.xml
diff --git a/branches/sca-java-1.5/demos/bigbank-account/pom.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/pom.xml
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountService.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountDetails.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountService.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/CheckingsAccount.composite b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/CheckingsAccount.composite
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/SavingsAccount.composite b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/SavingsAccount.composite
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/resources/SavingsAccount.composite
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/SavingsAccount.composite
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/StockAccount.composite b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/StockAccount.composite
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/resources/StockAccount.composite
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/StockAccount.composite
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/web/AccountJSON.html b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/web/AccountJSON.html
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/resources/web/AccountJSON.html
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/web/AccountJSON.html
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/web/style.css b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/web/style.css
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/resources/web/style.css
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/web/style.css
diff --git a/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-account/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/README b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/README
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/README
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/README
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/build.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/build.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/build.xml
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/pom.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/pom.xml
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/java/calculator/demo/CalculatorServer.java
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-1.5/demos/bigbank-stockquote/README b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/README
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-stockquote/README
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/README
diff --git a/branches/sca-java-1.5/demos/bigbank-stockquote/build.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/build.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-stockquote/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/build.xml
diff --git a/branches/sca-java-1.5/demos/bigbank-stockquote/pom.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-stockquote/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/pom.xml
diff --git a/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/PasswordCallbackHandler.java
diff --git a/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/java/stockquote/demo/StockQuoteServer.java
diff --git a/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/StockQuote.composite b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/StockQuote.composite
diff --git a/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/security.properties b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/security.properties
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/security.properties
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/security.properties
diff --git a/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/stockQuote.jks b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank-stockquote/src/main/resources/stockQuote.jks
diff --git a/branches/sca-java-1.5/demos/bigbank/README b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/README
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/README
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/README
diff --git a/branches/sca-java-1.5/demos/bigbank/bigbank.png b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/bigbank.png
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/bigbank.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/bigbank.png
diff --git a/branches/sca-java-1.5/demos/bigbank/bigbank.svg b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/bigbank.svg
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/bigbank.svg
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/bigbank.svg
diff --git a/branches/sca-java-1.5/demos/bigbank/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/build-dojo.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/build-dojo.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/build-dojo.xml
diff --git a/branches/sca-java-1.5/demos/bigbank/build.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/build.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/build.xml
diff --git a/branches/sca-java-1.5/demos/bigbank/pom.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/pom.xml
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/account/AccountService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/account/AccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/demo/BigBankServer.java
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/bigbank/security/BigbankPasswordCallbackHandler.java
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/java/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/java/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/BigBank.composite
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/resources/BigBank.composite
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/resources/bigbank.jks b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/bigbank.jks
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/resources/bigbank.jks
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/bigbank.jks
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/resources/security.properties b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/security.properties
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/resources/security.properties
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/security.properties
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/resources/web/AccountJSON.html b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/web/AccountJSON.html
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/resources/web/AccountJSON.html
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/web/AccountJSON.html
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/resources/web/style.css b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/web/style.css
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/resources/web/style.css
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/web/style.css
diff --git a/branches/sca-java-1.5/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-1.5/demos/bigbank/src/test/java/test/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/test/java/test/BigBankTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/demos/bigbank/src/test/java/test/BigBankTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/bigbank/src/test/java/test/BigBankTestCase.java
diff --git a/branches/sca-java-1.5/demos/mortgage-creditcheck/README b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/README
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-creditcheck/README
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/README
diff --git a/branches/sca-java-1.5/demos/mortgage-creditcheck/build.xml b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/build.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-creditcheck/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/build.xml
diff --git a/branches/sca-java-1.5/demos/mortgage-creditcheck/pom.xml b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-creditcheck/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/pom.xml
diff --git a/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/java/credit/CreditCheck.java
diff --git a/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckImpl.java
diff --git a/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/java/credit/CreditCheckServer.java
diff --git a/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
diff --git a/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
diff --git a/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-creditcheck/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/README b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/README
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/README
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/README
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/build.xml b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/build.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/build.xml
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/credit_composite.jpg b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/credit_composite.jpg
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/credit_composite.jpg
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/credit_composite.jpg
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/credit_composite.png b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/credit_composite.png
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/credit_composite.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/credit_composite.png
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/loan_approval.jpg b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/loan_approval.jpg
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/loan_approval.jpg
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/loan_approval.jpg
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/loan_approval.png b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/loan_approval.png
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/loan_approval.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/loan_approval.png
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly0.jpg
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly0.png b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly0.png
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly1.jpg
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly1.png b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly1.png
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly2.jpg
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly2.png b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_assembly2.png
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_composite.jpg b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_composite.jpg
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_composite.png b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_composite.png
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_composite.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_composite.png
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_diagrams.doc
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package1.jpg b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package1.jpg
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package1.png b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package1.png
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package1.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package1.png
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package2.jpg b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package2.jpg
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package2.png b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package2.png
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package2.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_package2.png
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_scenario.jpg
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_scenario.png b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_scenario.png
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_scenario.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/doc/mortgage_scenario.png
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/mortgage_assembly.png b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/mortgage_assembly.png
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/mortgage_assembly.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/mortgage_assembly.png
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/pom.xml b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/pom.xml
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheck.java
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/CreditCheckImpl.java
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/Customer.java
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuote.java
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/InterestRateQuoteImpl.java
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApproval.java
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculator.java
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageCalculatorImpl.java
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/MortgageClient.java
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessment.java
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/java/mortgage/RiskAssessmentImpl.java
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.componentType
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/MortgageCalculator.js
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
diff --git a/branches/sca-java-1.5/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/mortgage-loanapproval/src/test/java/mortgage/MortgageClientTestCase.java
diff --git a/branches/sca-java-1.5/demos/pom.xml b/sca-java-1.x/branches/sca-java-1.5/demos/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/pom.xml
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/README b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/README
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/README
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/README
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/build.xml b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/build.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/build.xml
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/pom.xml b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/pom.xml
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountData.java b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountData.java
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountDataImpl.java
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountService.java b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountService.java
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/BigBankServer.java
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/ExchangeRate.java
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/StockValue.java b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/java/bigbank/StockValue.java
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/BigBank.composite
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/BigBank.composite
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/accounts.xml b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/accounts.xml
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/accounts.xml
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/accounts.xml
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/customer.xsd b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/customer.xsd
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/customer.xsd
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/customer.xsd
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/stock.xq b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/stock.xq
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/stock.xq
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/stock.xq
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/xml-bigbank.png b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/xml-bigbank.png
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/xml-bigbank.png
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/xml-bigbank.png
diff --git a/branches/sca-java-1.5/demos/xml-bigbank/xml-bigbank.svg b/sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/xml-bigbank.svg
similarity index 100%
rename from branches/sca-java-1.5/demos/xml-bigbank/xml-bigbank.svg
rename to sca-java-1.x/branches/sca-java-1.5/demos/xml-bigbank/xml-bigbank.svg
diff --git a/branches/sca-java-1.5/distribution/bundle/pom.xml b/sca-java-1.x/branches/sca-java-1.5/distribution/bundle/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/distribution/bundle/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/distribution/bundle/pom.xml
diff --git a/branches/sca-java-1.5/distribution/manifest/pom.xml b/sca-java-1.x/branches/sca-java-1.5/distribution/manifest/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/distribution/manifest/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/distribution/manifest/pom.xml
diff --git a/branches/sca-java-1.5/distribution/pom.xml b/sca-java-1.x/branches/sca-java-1.5/distribution/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/distribution/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/distribution/pom.xml
diff --git a/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml b/sca-java-1.x/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml
similarity index 100%
rename from branches/sca-java-1.5/distribution/src/main/assembly/bin.xml
rename to sca-java-1.x/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml
diff --git a/branches/sca-java-1.5/distribution/src/main/assembly/src.xml b/sca-java-1.x/branches/sca-java-1.5/distribution/src/main/assembly/src.xml
similarity index 100%
rename from branches/sca-java-1.5/distribution/src/main/assembly/src.xml
rename to sca-java-1.x/branches/sca-java-1.5/distribution/src/main/assembly/src.xml
diff --git a/branches/sca-java-1.5/distribution/src/main/release/CHANGES b/sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/CHANGES
similarity index 100%
rename from branches/sca-java-1.5/distribution/src/main/release/CHANGES
rename to sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/CHANGES
diff --git a/branches/sca-java-1.5/distribution/src/main/release/README b/sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/README
similarity index 100%
rename from branches/sca-java-1.5/distribution/src/main/release/README
rename to sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/README
diff --git a/branches/sca-java-1.5/distribution/src/main/release/RELEASE_NOTES b/sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/RELEASE_NOTES
similarity index 100%
rename from branches/sca-java-1.5/distribution/src/main/release/RELEASE_NOTES
rename to sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-java-1.5/distribution/src/main/release/bin/INSTALL b/sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/bin/INSTALL
similarity index 100%
rename from branches/sca-java-1.5/distribution/src/main/release/bin/INSTALL
rename to sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/bin/INSTALL
diff --git a/branches/sca-java-1.5/distribution/src/main/release/bin/LICENSE b/sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/bin/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/distribution/src/main/release/bin/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/bin/LICENSE
diff --git a/branches/sca-java-1.5/distribution/src/main/release/bin/NOTICE b/sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/bin/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/distribution/src/main/release/bin/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/bin/NOTICE
diff --git a/branches/sca-java-1.5/distribution/src/main/release/src/BUILDING b/sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/src/BUILDING
similarity index 100%
rename from branches/sca-java-1.5/distribution/src/main/release/src/BUILDING
rename to sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/src/BUILDING
diff --git a/branches/sca-java-1.5/distribution/src/main/release/src/LICENSE b/sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/src/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/distribution/src/main/release/src/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/src/LICENSE
diff --git a/branches/sca-java-1.5/distribution/src/main/release/src/NOTICE b/sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/src/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/distribution/src/main/release/src/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/distribution/src/main/release/src/NOTICE
diff --git a/branches/sca-java-1.5/distribution/src/main/xsl/srcbuild_paths.xsl b/sca-java-1.x/branches/sca-java-1.5/distribution/src/main/xsl/srcbuild_paths.xsl
similarity index 100%
rename from branches/sca-java-1.5/distribution/src/main/xsl/srcbuild_paths.xsl
rename to sca-java-1.x/branches/sca-java-1.5/distribution/src/main/xsl/srcbuild_paths.xsl
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/client/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/client/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/client/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/client/pom.xml
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/java/itest/MyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/resources/MyClient.composite b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/pom.xml
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/service/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/service/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/service/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/service/pom.xml
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/java/itest/MyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/resources/MyService.composite b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/resources/MyService.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/resources/MyService.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/service/src/main/resources/MyService.composite
diff --git a/branches/sca-java-1.5/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/pom.xml
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-ws/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/pom.xml
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/pom.xml
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/log4j.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/log4j.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/helloworld/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.5/itest/bpel/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/bpel/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/bpel/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/bpel/pom.xml
diff --git a/branches/sca-java-1.5/itest/build-was-integration.xml b/sca-java-1.x/branches/sca-java-1.5/itest/build-was-integration.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/build-was-integration.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/build-was-integration.xml
diff --git a/branches/sca-java-1.5/itest/builder/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/pom.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
diff --git a/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
diff --git a/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
diff --git a/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
diff --git a/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
diff --git a/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario1/scenario1.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario1/scenario1.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario1/scenario1.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario1/scenario1.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario1/scenario1a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario1/scenario1a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario1/scenario1a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario1/scenario1a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/scenario10.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/scenario10.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/scenario10.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/scenario10.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/scenario10a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/scenario10a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/scenario10a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/scenario10a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/service3.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/service3.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/service3.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario10/service3.wsdl
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/scenario11.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/scenario11.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/scenario11.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/scenario11.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/scenario11a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/scenario11a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/scenario11a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/scenario11a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/service3.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/service3.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/service3.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario11/service3.wsdl
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario12/scenario12.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario12/scenario12.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario12/scenario12.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario12/scenario12.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario12/scenario12a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario12/scenario12a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario12/scenario12a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario12/scenario12a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario13/scenario13.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario13/scenario13.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario13/scenario13.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario13/scenario13.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario13/scenario13a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario13/scenario13a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario13/scenario13a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario13/scenario13a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario2/scenario2.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario2/scenario2.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario2/scenario2.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario2/scenario2.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario2/scenario2a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario2/scenario2a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario2/scenario2a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario2/scenario2a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario3/scenario3.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario3/scenario3.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario3/scenario3.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario3/scenario3.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario3/scenario3a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario3/scenario3a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario3/scenario3a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario3/scenario3a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario4/scenario4.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario4/scenario4.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario4/scenario4.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario4/scenario4.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario4/scenario4a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario4/scenario4a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario4/scenario4a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario4/scenario4a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/scenario5.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/scenario5.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/scenario5.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/scenario5.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/scenario5a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/scenario5a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/scenario5a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/scenario5a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/scenarios.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/scenarios.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario5/scenarios.wsdl
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/scenario6.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/scenario6.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/scenario6.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/scenario6.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/scenario6a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/scenario6a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/scenario6a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/scenario6a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/scenarios.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/scenarios.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario6/scenarios.wsdl
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/scenario7.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/scenario7.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/scenario7.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/scenario7.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/scenario7a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/scenario7a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/scenario7a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/scenario7a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/scenarios.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/scenarios.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario7/scenarios.wsdl
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/scenario8.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/scenario8.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/scenario8.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/scenario8.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/scenario8a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/scenario8a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/scenario8a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/scenario8a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/scenarios.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/scenarios.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario8/scenarios.wsdl
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario9/scenario9.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario9/scenario9.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario9/scenario9.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario9/scenario9.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/main/resources/scenario9/scenario9a.composite b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario9/scenario9a.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/main/resources/scenario9/scenario9a.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/main/resources/scenario9/scenario9a.composite
diff --git a/branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
diff --git a/branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
diff --git a/branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
diff --git a/branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/sca-java-1.x/branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
similarity index 100%
rename from branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/pom.xml
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/main/resources/example.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/resources/example.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/main/resources/example.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/main/resources/example.composite
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-java-1.5/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/pom.xml
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
diff --git a/branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
diff --git a/branches/sca-java-1.5/itest/callback-api/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callback-api/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-api/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-api/pom.xml
diff --git a/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/resources/CallBackApiTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-api/src/main/resources/CallBackApiTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/branches/sca-java-1.5/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
diff --git a/branches/sca-java-1.5/itest/callback-basic/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-basic/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/pom.xml
diff --git a/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/branches/sca-java-1.5/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/branches/sca-java-1.5/itest/callback-complex-type/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-complex-type/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/pom.xml
diff --git a/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/branches/sca-java-1.5/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/branches/sca-java-1.5/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
diff --git a/branches/sca-java-1.5/itest/callback-composite-scope/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-composite-scope/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/pom.xml
diff --git a/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java
diff --git a/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java
diff --git a/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java
diff --git a/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite
diff --git a/branches/sca-java-1.5/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java
diff --git a/branches/sca-java-1.5/itest/callback-id/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callback-id/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-id/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-id/pom.xml
diff --git a/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
diff --git a/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
diff --git a/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
diff --git a/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-id/src/main/resources/CallBackIdClient.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/main/resources/CallBackIdClient.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-id/src/main/resources/CallBackIdClient.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/main/resources/CallBackIdClient.composite
diff --git a/branches/sca-java-1.5/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
diff --git a/branches/sca-java-1.5/itest/callback-multiple-wires/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-multiple-wires/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/pom.xml
diff --git a/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
diff --git a/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
diff --git a/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
diff --git a/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
diff --git a/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
diff --git a/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
diff --git a/branches/sca-java-1.5/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
diff --git a/branches/sca-java-1.5/itest/callback-separatethread/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-separatethread/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/pom.xml
diff --git a/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
diff --git a/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
diff --git a/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
diff --git a/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
diff --git a/branches/sca-java-1.5/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
diff --git a/branches/sca-java-1.5/itest/callback-set-callback/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-callback/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/pom.xml
diff --git a/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
diff --git a/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
diff --git a/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
diff --git a/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
diff --git a/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
diff --git a/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
diff --git a/branches/sca-java-1.5/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
diff --git a/branches/sca-java-1.5/itest/callback-set-conversation/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-conversation/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/pom.xml
diff --git a/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
diff --git a/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
diff --git a/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
diff --git a/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
diff --git a/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
diff --git a/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
diff --git a/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
diff --git a/branches/sca-java-1.5/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
diff --git a/branches/sca-java-1.5/itest/component-type/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/pom.xml
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/java/calculator/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/branches/sca-java-1.5/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/build-jar.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-test/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-classloader/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-folder/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionFolderTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-folder/src/test/java/ContributionZIPTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-folder/src/test/resources/repository3/contribution.zip
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-composite/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-java/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-resource/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-composite/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-java/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-resource/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/main/resources/store.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-import-export/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/main/java/org/apache/tuscany/sca/test/contribution/jee/TestExternalEarModelResolver.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/ContributionServiceTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarAppcompTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAJarEarNonenhancedTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/enhanced-app.ear
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb-w-dep.jar
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.ear
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-ejb.jar
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-service.jar
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web-w-dep.war
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/helloworld-web.war
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app-ear.jar
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-jee/src/test/resources/repository/simple-app.ear
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/Hello.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/pom.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/AddServiceImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorClient.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractService.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/resources/ContributionTest.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/Calculator.composite
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/main/resources/calculator/sca-contribution.xml
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/test/resources/deployables/sample-calculator.jar
rename to 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
similarity index 100%
rename from branches/sca-java-1.5/itest/contribution/src/test/resources/repository/sample-calculator.jar
rename to sca-java-1.x/branches/sca-java-1.5/itest/contribution/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-java-1.5/itest/conversations-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/pom.xml
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
diff --git a/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
diff --git a/branches/sca-java-1.5/itest/conversations/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/pom.xml
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationAge.composite b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationAge.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationAge.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationAge.composite
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationUniqueId.composite b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationUniqueId.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationUniqueId.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/ConversationUniqueId.composite
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationId.composite b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationId.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/resources/conversationId.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationId.composite
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationLifetime.composite b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationLifetime.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/resources/conversationLifetime.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversationLifetime.composite
diff --git a/branches/sca-java-1.5/itest/conversations/src/main/resources/conversational.composite b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversational.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/main/resources/conversational.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/main/resources/conversational.composite
diff --git a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
diff --git a/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
diff --git a/branches/sca-java-1.5/itest/corba/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/corba/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/pom.xml
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
diff --git a/branches/sca-java-1.5/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioFive.composite b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioFive.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioFive.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioFive.composite
diff --git a/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioFour.composite b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioFour.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioFour.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioFour.composite
diff --git a/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioOne.composite b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioOne.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioOne.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioOne.composite
diff --git a/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioSix.composite b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioSix.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioSix.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioSix.composite
diff --git a/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioThree.composite b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioThree.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioThree.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioThree.composite
diff --git a/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioTwo.composite b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioTwo.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioTwo.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/ScenarioTwo.composite
diff --git a/branches/sca-java-1.5/itest/corba/src/test/resources/itest_scenario.idl b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/itest_scenario.idl
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/resources/itest_scenario.idl
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/itest_scenario.idl
diff --git a/branches/sca-java-1.5/itest/corba/src/test/resources/scenariofour.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/scenariofour.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/corba/src/test/resources/scenariofour.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/corba/src/test/resources/scenariofour.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/pom.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/generate.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/generate.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/generate.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/generate/generate.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Annotation.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Annotation.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Annotation.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Attribute.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Attribute.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Attribute.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Import.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Import.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Import.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Import.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Import.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Import.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Import.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Import.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Include.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Include.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Include.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Include.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Include.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Include.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Include.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Include.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Interop.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Interop.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Interop.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Notation.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Notation.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Notation.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Notation.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Notation.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Notation.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Notation.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Person.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Person.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Person.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/Person.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
diff --git a/branches/sca-java-1.5/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
diff --git a/branches/sca-java-1.5/itest/databindings/config.png b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/config.png
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/config.png
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/config.png
diff --git a/branches/sca-java-1.5/itest/databindings/config.svg b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/config.svg
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/config.svg
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/config.svg
diff --git a/branches/sca-java-1.5/itest/databindings/databinding.png b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/databinding.png
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/databinding.png
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/databinding.png
diff --git a/branches/sca-java-1.5/itest/databindings/databinding.svg b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/databinding.svg
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/databinding.svg
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/databinding.svg
diff --git a/branches/sca-java-1.5/itest/databindings/interop.png b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop.png
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/interop.png
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop.png
diff --git a/branches/sca-java-1.5/itest/databindings/interop.svg b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop.svg
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/interop.svg
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop.svg
diff --git a/branches/sca-java-1.5/itest/databindings/interop/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/interop/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop/pom.xml
diff --git a/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
diff --git a/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
diff --git a/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
diff --git a/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/generate.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/generate.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/pom.xml
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/pom.xml
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
diff --git a/branches/sca-java-1.5/itest/databindings/jaxbgen/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxbgen/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxbgen/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxbgen/pom.xml
diff --git a/branches/sca-java-1.5/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-1.5/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxbgen/src/main/resources/greeter.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/jaxbgen/src/main/resources/greeter.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/jaxbgen/src/main/resources/greeter.composite
diff --git a/branches/sca-java-1.5/itest/databindings/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/pom.xml
diff --git a/branches/sca-java-1.5/itest/databindings/readme.html b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/readme.html
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/readme.html
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/readme.html
diff --git a/branches/sca-java-1.5/itest/databindings/sdogen/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/sdogen/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/sdogen/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/sdogen/pom.xml
diff --git a/branches/sca-java-1.5/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/sdogen/src/main/resources/generate/generate.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/sdogen/src/main/resources/generate/generate.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/sdogen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-java-1.5/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/sca-java-1.x/branches/sca-java-1.5/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
similarity index 100%
rename from branches/sca-java-1.5/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
rename to sca-java-1.x/branches/sca-java-1.5/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
diff --git a/branches/sca-java-1.5/itest/domain/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/domain/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/pom.xml
diff --git a/branches/sca-java-1.5/itest/domain/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/itest/domain/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
diff --git a/branches/sca-java-1.5/itest/domain/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/domain/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/itest/domain/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/domain/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/domain/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/itest/domain/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/domain/src/main/resources/contributionA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionA/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/resources/contributionA/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionA/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionDependent/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/resources/contributionDependent/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionDependent/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding-ws/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/pom.xml
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/pom.xml
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-java-1.5/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/pom.xml
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/resources/example.composite b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/resources/example.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/resources/example.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/resources/example.composite
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
diff --git a/branches/sca-java-1.5/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-java-1.5/itest/exceptions/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions/pom.xml
diff --git a/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
diff --git a/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
diff --git a/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
diff --git a/branches/sca-java-1.5/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/resources/ExceptionTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions/src/main/resources/ExceptionTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-java-1.5/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
diff --git a/branches/sca-java-1.5/itest/extended-api/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/extended-api/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/extended-api/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/extended-api/pom.xml
diff --git a/branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
diff --git a/branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
diff --git a/branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/extended-api/src/main/resources/BasicService.composite b/sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/main/resources/BasicService.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/extended-api/src/main/resources/BasicService.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/main/resources/BasicService.composite
diff --git a/branches/sca-java-1.5/itest/extended-api/src/main/resources/MathService.composite b/sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/main/resources/MathService.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/extended-api/src/main/resources/MathService.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/main/resources/MathService.composite
diff --git a/branches/sca-java-1.5/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
diff --git a/branches/sca-java-1.5/itest/http-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/http-jsonrpc/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/pom.xml
diff --git a/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/bean/TestBean.java b/sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/bean/TestBean.java
similarity index 100%
rename from branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/bean/TestBean.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/bean/TestBean.java
diff --git a/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/echo/Echo.java
similarity index 100%
rename from branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/echo/Echo.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/echo/Echo.java
diff --git a/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java b/sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/echo/EchoBusinessException.java
diff --git a/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCDataTypeTestCase.java
diff --git a/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCExceptionTestCase.java
diff --git a/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCServiceTestCase.java
diff --git a/branches/sca-java-1.5/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite b/sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/http-jsonrpc/src/test/resources/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCBinding.composite
diff --git a/branches/sca-java-1.5/itest/implementation-jee-external-ear/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/implementation-jee-external-ear/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/pom.xml
diff --git a/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
similarity index 100%
rename from branches/sca-java-1.5/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/main/resources/test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/main/resources/test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/implementation-jee-external-ear/src/main/resources/test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/main/resources/test.composite
diff --git a/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java b/sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java
similarity index 100%
rename from branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/Helloworld.java
diff --git a/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/JeeTestCase.java
diff --git a/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/MockImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/implementation-jee-external-ear/src/test/java/itest/SomeCustomModelResolver.java
diff --git a/branches/sca-java-1.5/itest/interfaces/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/pom.xml
diff --git a/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
diff --git a/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
diff --git a/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
diff --git a/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
diff --git a/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
diff --git a/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
diff --git a/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
diff --git a/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/interfaces/src/main/resources/InterfacesTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/resources/InterfacesTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/main/resources/InterfacesTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/main/resources/InterfacesTest.composite
diff --git a/branches/sca-java-1.5/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
diff --git a/branches/sca-java-1.5/itest/interop-soap-client/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-client/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-client/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-client/pom.xml
diff --git a/branches/sca-java-1.5/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/interop-soap-client/src/main/resources/default.composite b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-client/src/main/resources/default.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-client/src/main/resources/default.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-client/src/main/resources/default.composite
diff --git a/branches/sca-java-1.5/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
diff --git a/branches/sca-java-1.5/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
diff --git a/branches/sca-java-1.5/itest/interop-soap-round2-client/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-round2-client/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-round2-client/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-round2-client/pom.xml
diff --git a/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
diff --git a/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/default.composite b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/default.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/default.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/default.composite
diff --git a/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
diff --git a/branches/sca-java-1.5/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
diff --git a/branches/sca-java-1.5/itest/interop-soap-service/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-service/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-service/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-service/pom.xml
diff --git a/branches/sca-java-1.5/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
diff --git a/branches/sca-java-1.5/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
diff --git a/branches/sca-java-1.5/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/itest/interop-soap-service/t.bat b/sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-service/t.bat
similarity index 100%
rename from branches/sca-java-1.5/itest/interop-soap-service/t.bat
rename to sca-java-1.x/branches/sca-java-1.5/itest/interop-soap-service/t.bat
diff --git a/branches/sca-java-1.5/itest/java-init-exceptions/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/java-init-exceptions/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/pom.xml
diff --git a/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java b/sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/ConstructorException.java
diff --git a/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java b/sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/InitCompositeScopeException.java
diff --git a/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java b/sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/InitRequestScopeException.java
diff --git a/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java b/sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/InitStatelessScopeException.java
diff --git a/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/OkImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/OkImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/OkImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/OkImpl.java
diff --git a/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/Service.java b/sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/Service.java
similarity index 100%
rename from branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/Service.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/java/itest/Service.java
diff --git a/branches/sca-java-1.5/itest/java-init-exceptions/src/main/resources/test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/resources/test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/java-init-exceptions/src/main/resources/test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/main/resources/test.composite
diff --git a/branches/sca-java-1.5/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/java-init-exceptions/src/test/java/itest/InitTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-args/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-args/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-args/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-args/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/branches/sca-java-1.5/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-args/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms-args/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-args/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-args/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms-args/src/main/resources/selectors/selectors.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-args/src/main/resources/selectors/selectors.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-args/src/main/resources/selectors/selectors.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-args/src/main/resources/selectors/selectors.composite
diff --git a/branches/sca-java-1.5/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-callbacks/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-callbacks/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
diff --git a/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
diff --git a/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-callbacks/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-callbacks/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms-callbacks/src/main/resources/simple/client.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/resources/simple/client.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-callbacks/src/main/resources/simple/client.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/resources/simple/client.composite
diff --git a/branches/sca-java-1.5/itest/jms-callbacks/src/main/resources/simple/tempq.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/resources/simple/tempq.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-callbacks/src/main/resources/simple/tempq.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/main/resources/simple/tempq.composite
diff --git a/branches/sca-java-1.5/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-definitions/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-definitions/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-java-1.5/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-definitions/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-definitions/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/jms-definitions/src/main/resources/definitions/definitions.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/main/resources/definitions/definitions.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-definitions/src/main/resources/definitions/definitions.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/main/resources/definitions/definitions.composite
diff --git a/branches/sca-java-1.5/itest/jms-definitions/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-definitions/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-format/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsbytes/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsbytesxml/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsbytesxml/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsbytesxml/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsbytesxml/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsdefault/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsdefault/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsdefault/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsdefault/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsmessage/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsmessage/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsobject/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsobject/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsobject/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsobject/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmsobject/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxml/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxml/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/jms-format/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/resources/exceptions/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/resources/exceptions/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/resources/exceptions/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/resources/exceptions/service.composite
diff --git a/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nonscaclient-exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-noreplyto/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-noreplyto/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-noreplyto/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-noreplyto/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-noreplyto/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms-noreplyto/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-noreplyto/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-noreplyto/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms-noreplyto/src/main/resources/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-noreplyto/src/main/resources/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-noreplyto/src/main/resources/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-noreplyto/src/main/resources/service.composite
diff --git a/branches/sca-java-1.5/itest/jms-noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-nulls/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nulls/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/branches/sca-java-1.5/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-nulls/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nulls/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms-nulls/src/main/resources/nulls.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/src/main/resources/nulls.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nulls/src/main/resources/nulls.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/src/main/resources/nulls.composite
diff --git a/branches/sca-java-1.5/itest/jms-nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-oneway-nocf/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-oneway-nocf/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayClient.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayClient.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayClient.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayClient.composite
diff --git a/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayService.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayService.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayService.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/main/resources/oneway/OneWayService.composite
diff --git a/branches/sca-java-1.5/itest/jms-oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-responsecf/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-responsecf/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-responsecf/src/main/resources/cf/client.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/main/resources/cf/client.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-responsecf/src/main/resources/cf/client.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/main/resources/cf/client.composite
diff --git a/branches/sca-java-1.5/itest/jms-responsecf/src/main/resources/cf/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/main/resources/cf/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-responsecf/src/main/resources/cf/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/main/resources/cf/service.composite
diff --git a/branches/sca-java-1.5/itest/jms-responsecf/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-responsecf/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms-responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jmsdefault/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jmsdefault/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jmsdefault/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jmsdefault/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jmsuserprop/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jmsuserprop/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jmsuserprop/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jmsuserprop/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/selectors/selectors.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/selectors/selectors.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/main/resources/selectors/selectors.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/main/resources/selectors/selectors.composite
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-topics/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-topics/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-java-1.5/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-topics/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-topics/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms-topics/src/main/resources/topics/TopicsClient.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/main/resources/topics/TopicsClient.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-topics/src/main/resources/topics/TopicsClient.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/main/resources/topics/TopicsClient.composite
diff --git a/branches/sca-java-1.5/itest/jms-topics/src/main/resources/topics/TopicsService.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/main/resources/topics/TopicsService.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-topics/src/main/resources/topics/TopicsService.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/main/resources/topics/TopicsService.composite
diff --git a/branches/sca-java-1.5/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms-ttl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-ttl/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms-ttl/src/main/java/itest/MockInitialContextFactory.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/src/main/java/itest/MockInitialContextFactory.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-ttl/src/main/java/itest/MockInitialContextFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/src/main/java/itest/MockInitialContextFactory.java
diff --git a/branches/sca-java-1.5/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
diff --git a/branches/sca-java-1.5/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-java-1.5/itest/jms-ttl/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-ttl/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms-ttl/src/main/resources/ttl.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/src/main/resources/ttl.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-ttl/src/main/resources/ttl.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/src/main/resources/ttl.composite
diff --git a/branches/sca-java-1.5/itest/jms-ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms-ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms-ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/pom.xml
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/defaults/client.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/defaults/client.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/defaults/client.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/defaults/client.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/defaults/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/defaults/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/defaults/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/defaults/service.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/dynamic/client.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/dynamic/client.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/dynamic/client.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/dynamic/client.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/client.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/client.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/client.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/client.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/exceptions/service.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/external/client.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/external/client.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/external/client.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/external/client.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/external/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/external/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/external/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/external/service.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/nonSCAclient/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/nonSCAclient/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/nonSCAclient/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/nonSCAclient/service.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayClient.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayClient.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayClient.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayClient.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayService.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayService.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayService.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/oneway/OneWayService.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/definitions.xml
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/properties/properties.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/properties/properties.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/properties/properties.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/properties/properties.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/client.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/simple/client.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/simple/client.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/simple/client.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/mpclient.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/simple/mpclient.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/simple/mpclient.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/simple/mpclient.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/mpservice.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/simple/mpservice.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/simple/mpservice.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/simple/mpservice.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/simple/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/simple/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/simple/service.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/main/resources/simple/uriclient.composite b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/simple/uriclient.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/main/resources/simple/uriclient.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/main/resources/simple/uriclient.composite
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/pom.xml
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
diff --git a/branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
diff --git a/branches/sca-java-1.5/itest/oneway/build.xml b/sca-java-1.x/branches/sca-java-1.5/itest/oneway/build.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/oneway/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/oneway/build.xml
diff --git a/branches/sca-java-1.5/itest/oneway/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/oneway/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/oneway/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/oneway/pom.xml
diff --git a/branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
diff --git a/branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/sca-java-1.x/branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
diff --git a/branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
diff --git a/branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/sca-java-1.x/branches/sca-java-1.5/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
diff --git a/branches/sca-java-1.5/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
diff --git a/branches/sca-java-1.5/itest/operation-overloading/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/operation-overloading/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/operation-overloading/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/operation-overloading/pom.xml
diff --git a/branches/sca-java-1.5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-1.x/branches/sca-java-1.5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
similarity index 100%
rename from branches/sca-java-1.5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/branches/sca-java-1.5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-1.x/branches/sca-java-1.5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
similarity index 100%
rename from branches/sca-java-1.5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
diff --git a/branches/sca-java-1.5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-1.x/branches/sca-java-1.5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
similarity index 100%
rename from branches/sca-java-1.5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
diff --git a/branches/sca-java-1.5/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-1.x/branches/sca-java-1.5/itest/operation-overloading/src/main/resources/OperationOverload.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/operation-overloading/src/main/resources/OperationOverload.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/branches/sca-java-1.5/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/pom.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/build-bundles.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/build-bundles.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/build-bundles.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/build-bundles.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/pom.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-test/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/pom.xml
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
diff --git a/branches/sca-java-1.5/itest/osgi-contribution/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-contribution/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-contribution/pom.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/build-bundles.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/build-bundles.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/build-bundles.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/build-bundles.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/pom.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Customer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Customer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Customer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/services-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/services-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/services-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/services/services-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/version-test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/version-test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/version-test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/version/version-test.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
diff --git a/branches/sca-java-1.5/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/pom.xml
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/build-bundles.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/build-bundles.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/build-bundles.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/build-bundles.xml
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/pom.xml
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
diff --git a/branches/sca-java-1.5/itest/osgi-tuscany/tuscany-versioned/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/tuscany-versioned/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/osgi-tuscany/tuscany-versioned/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/osgi-tuscany/tuscany-versioned/pom.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-basicauth/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/pom.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
diff --git a/branches/sca-java-1.5/itest/policy-security-jsr250/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-jsr250/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/pom.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
diff --git a/branches/sca-java-1.5/itest/policy-security-token/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-token/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/pom.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
diff --git a/branches/sca-java-1.5/itest/policy-security/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security/pom.xml
diff --git a/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/policy-security/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/policy-security/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/resources/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security/src/main/resources/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
diff --git a/branches/sca-java-1.5/itest/policy/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/pom.xml
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/PolicyQNames.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/PolicyQNames.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/PolicyQNames.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/PolicyQNames.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.5/itest/policy/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
diff --git a/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
diff --git a/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
diff --git a/branches/sca-java-1.5/itest/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/pom.xml
diff --git a/branches/sca-java-1.5/itest/promotion-interface-missmatch/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/promotion-interface-missmatch/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/pom.xml
diff --git a/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java b/sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
diff --git a/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java b/sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/resources/example.composite b/sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/resources/example.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/resources/example.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/resources/example.composite
diff --git a/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
diff --git a/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
diff --git a/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-java-1.5/itest/properties/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/properties/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/pom.xml
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/java/test/jaxb/props/package-info.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/test/jaxb/props/package-info.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/java/test/jaxb/props/package-info.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/java/test/jaxb/props/package-info.java
diff --git a/branches/sca-java-1.5/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
diff --git a/branches/sca-java-1.5/itest/properties/src/main/resources/Outer.composite b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/Outer.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/resources/Outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/Outer.composite
diff --git a/branches/sca-java-1.5/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/OuterPropertyTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/resources/OuterPropertyTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/branches/sca-java-1.5/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/PropertyTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/resources/PropertyTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/branches/sca-java-1.5/itest/properties/src/main/resources/customer.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/customer.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/resources/customer.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/customer.xsd
diff --git a/branches/sca-java-1.5/itest/properties/src/main/resources/fileProperty.txt b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/fileProperty.txt
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/resources/fileProperty.txt
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/fileProperty.txt
diff --git a/branches/sca-java-1.5/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/manyValuesFileProperty.txt
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/resources/manyValuesFileProperty.txt
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/branches/sca-java-1.5/itest/properties/src/main/resources/mySimpleService.composite b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/mySimpleService.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/resources/mySimpleService.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/mySimpleService.composite
diff --git a/branches/sca-java-1.5/itest/properties/src/main/resources/rcProps.txt b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/rcProps.txt
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/resources/rcProps.txt
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/rcProps.txt
diff --git a/branches/sca-java-1.5/itest/properties/src/main/resources/rcprops.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/rcprops.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/main/resources/rcprops.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/main/resources/rcprops.xsd
diff --git a/branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
diff --git a/branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive-multi-level/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-multi-level/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/pom.xml
diff --git a/branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
diff --git a/branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
diff --git a/branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
diff --git a/branches/sca-java-1.5/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
diff --git a/branches/sca-java-1.5/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
diff --git a/branches/sca-java-1.5/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/pom.xml
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/Target.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/Target.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/Target.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/Target.java
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/Composer.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/Composer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/Composer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/Composer.java
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Client.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Client.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Client.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Client.composite
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Inner.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Inner.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Inner.composite
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Outer.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Outer.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/Outer.composite
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/main/resources/policy/definitions.xml
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
diff --git a/branches/sca-java-1.5/itest/recursive/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/pom.xml
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/circular/include/DemoClass.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/circular/include/DemoClass.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/circular/include/DemoClass.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/circular/include/DemoClass.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/composite/CompositeClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/composite/CompositeClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/composite/Source.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/composite/Source.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/composite/Source.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/composite/SourceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/composite/SourceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/composite/SourceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/composite/SourceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/composite/Target.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/composite/Target.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/composite/Target.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/composite/TargetImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/composite/TargetImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/foo/A.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/foo/A.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/foo/A.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/foo/A.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/foo/B.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/foo/B.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/foo/B.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/foo/B.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/foo/I.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/foo/I.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/foo/I.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/foo/I.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/policy/Target.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/policy/Target.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/policy/Target.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/policy/Target.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/policy/TargetClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/policy/TargetClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/policy/TargetClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/policy/TargetClientImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/policy/TargetServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/policy/TargetServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/policy/TargetServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/policy/TargetServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentAImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentAImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentAImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentAImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentCImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentCImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentCImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentCImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentEImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentEImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentEImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentEImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentFImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentFImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentFImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/sample/ComponentFImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/sample/Service1.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/sample/Service1.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/sample/Service1.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/sample/Service1.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/test/Aggregator.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test/Aggregator.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/test/Aggregator.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test/Aggregator.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/test/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test/AggregatorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/test/AggregatorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test/AggregatorImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/test/InnerSourceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test/InnerSourceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/test/InnerSourceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test/InnerSourceImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/test/OuterSourceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test/OuterSourceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/test/OuterSourceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test/OuterSourceImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/test/Source.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test/Source.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/test/Source.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test/Source.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/test1/composite/Target.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test1/composite/Target.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/test1/composite/Target.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test1/composite/Target.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/test1/composite/TargetOne.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test1/composite/TargetOne.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/test1/composite/TargetOne.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test1/composite/TargetOne.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test1/composite/TargetTwo.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/java/test1/composite/TargetTwo.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/java/test1/composite/TargetTwo.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/AComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/AComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/AComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/AComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/BComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/BComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/BComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/BComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/CComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/CComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/CComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/CComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/Composite1.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Composite1.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/Composite1.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Composite1.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/Composite2.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Composite2.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/Composite2.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Composite2.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/Composite3.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Composite3.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/Composite3.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Composite3.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/Demo1Composite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Demo1Composite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/Demo1Composite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Demo1Composite.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/Demo2Composite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Demo2Composite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/Demo2Composite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Demo2Composite.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/Inner.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Inner.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/Inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Inner.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/InnerComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/InnerComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/InnerComposite2.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/InnerComposite2.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/Outer.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Outer.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/Outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/Outer.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/OuterComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/OuterComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/foo.png b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/foo.png
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/foo/foo.png
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/foo.png
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o1.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o1.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o1.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o1.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o2.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o2.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o2.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o2.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o3.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o3.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o3.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o3.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o4.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o4.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o4.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/foo/o4.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/policy/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/policy/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/policy/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/policy/definitions.xml
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/test1/InnerComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/test1/InnerComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/test1/InnerComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/test1/InnerComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/main/resources/test1/OuterComposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/test1/OuterComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/main/resources/test1/OuterComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/main/resources/test1/OuterComposite.composite
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/composite/CompositeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/composite/CompositeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/foo/O2TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/foo/O2TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/foo/O2TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/foo/O2TestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/foo/O4TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/foo/O4TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/foo/O4TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/foo/O4TestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/policy/PolicyTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/policy/PolicyTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/policy/PolicyTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/policy/PolicyTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/sample/C.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/C.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/sample/C.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/C.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/sample/CImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/CImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/sample/CImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/CImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/sample/NestedTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/NestedTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/sample/NestedTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/NestedTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/sample/X.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/X.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/sample/X.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/X.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/sample/XImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/XImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/sample/XImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/XImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/sample/Y.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/Y.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/sample/Y.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/Y.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/sample/YImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/YImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/sample/YImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/sample/YImpl.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/test/InnerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/test/InnerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/test/InnerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/test/InnerTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/test/OuterTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/test/OuterTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/test/OuterTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/test/OuterTestCase.java
diff --git a/branches/sca-java-1.5/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
diff --git a/branches/sca-java-1.5/itest/references-collection/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/references-collection/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/references-collection/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/references-collection/pom.xml
diff --git a/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/Crawler.java b/sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/Crawler.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/Crawler.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/Crawler.java
diff --git a/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/CrawlerController.java b/sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/CrawlerController.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/CrawlerController.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/CrawlerController.java
diff --git a/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/impl/CrawlerControllerImpl.java
diff --git a/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/impl/CrawlerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/impl/CrawlerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/impl/CrawlerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/impl/CrawlerImpl.java
diff --git a/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/impl/SpecialCrawlerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/impl/SpecialCrawlerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/impl/SpecialCrawlerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/main/java/crawler/impl/SpecialCrawlerImpl.java
diff --git a/branches/sca-java-1.5/itest/references-collection/src/main/resources/test.composite b/sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/main/resources/test.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/references-collection/src/main/resources/test.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/main/resources/test.composite
diff --git a/branches/sca-java-1.5/itest/references-collection/src/test/java/crawler/ReferenceMultiplicityTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/test/java/crawler/ReferenceMultiplicityTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references-collection/src/test/java/crawler/ReferenceMultiplicityTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references-collection/src/test/java/crawler/ReferenceMultiplicityTestCase.java
diff --git a/branches/sca-java-1.5/itest/references/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/references/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/references/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/pom.xml
diff --git a/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
diff --git a/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
diff --git a/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
diff --git a/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
diff --git a/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
diff --git a/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/resources/AutoWiredReferencesTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/main/resources/AutoWiredReferencesTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/resources/AutoWiredReferencesTest.composite
diff --git a/branches/sca-java-1.5/itest/references/src/main/resources/InnerReferencesTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/resources/InnerReferencesTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/main/resources/InnerReferencesTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/resources/InnerReferencesTest.composite
diff --git a/branches/sca-java-1.5/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/resources/ManualWiredReferencesTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/main/resources/ManualWiredReferencesTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/main/resources/ManualWiredReferencesTest.composite
diff --git a/branches/sca-java-1.5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
diff --git a/branches/sca-java-1.5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
diff --git a/branches/sca-java-1.5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
diff --git a/branches/sca-java-1.5/itest/scopes/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/scopes/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/scopes/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/scopes/pom.xml
diff --git a/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
diff --git a/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
diff --git a/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/sca-java-1.x/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
similarity index 100%
rename from branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
diff --git a/branches/sca-java-1.5/itest/scopes/src/main/resources/scopes.composite b/sca-java-1.x/branches/sca-java-1.5/itest/scopes/src/main/resources/scopes.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/scopes/src/main/resources/scopes.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/scopes/src/main/resources/scopes.composite
diff --git a/branches/sca-java-1.5/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
diff --git a/branches/sca-java-1.5/itest/serialization/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/pom.xml
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
diff --git a/branches/sca-java-1.5/itest/serialization/src/main/resources/nestedcomposite.composite b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/resources/nestedcomposite.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/main/resources/nestedcomposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/main/resources/nestedcomposite.composite
diff --git a/branches/sca-java-1.5/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
diff --git a/branches/sca-java-1.5/itest/services/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/services/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/services/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/pom.xml
diff --git a/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
diff --git a/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
diff --git a/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
diff --git a/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
similarity index 100%
rename from branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
diff --git a/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
diff --git a/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
diff --git a/branches/sca-java-1.5/itest/services/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/services/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/services/src/main/resources/ServicesTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/resources/ServicesTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/services/src/main/resources/ServicesTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/src/main/resources/ServicesTest.composite
diff --git a/branches/sca-java-1.5/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
diff --git a/branches/sca-java-1.5/itest/spring/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/spring/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/pom.xml
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/calculator/security/UserPrincipal.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/security/UserPrincipal.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/calculator/security/UserPrincipal.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/calculator/security/UserPrincipal.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/context/access/SCAApplicationContextProvider.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/CalculatorService-context.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/CalculatorService-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/CalculatorService-context.xml
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-access/CalculatorService-context.xml
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-imports/CalculatorService-context.xml
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-imports/SpringImport-context.xml
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-multiple/StockQuoteService-context.xml
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/context-multiple/beanRefContext.xml
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/implementation-policies/CalculatorService-context.xml
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/META-INF/sca/spring-annotation/CalculatorService-context.xml
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/context/access/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/context/access/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/context/access/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/context/access/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/context/imports/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/context/imports/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/context/imports/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/context/imports/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/context/multiple/StockQuote.composite b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/context/multiple/StockQuote.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/context/multiple/StockQuote.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/context/multiple/StockQuote.composite
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/CalculatorJass.config
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/implementation/policies/definitions.xml
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.5/itest/spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/spring/annotations/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/main/resources/spring/annotations/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/main/resources/spring/annotations/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/context/access/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/context/access/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/context/access/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/context/access/CalculatorClient.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/context/access/ContextAccessTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/context/access/ContextAccessTestCase.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/context/imports/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/context/imports/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/context/imports/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/context/imports/CalculatorClient.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/context/imports/ContextImportsTestCase.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/context/multiple/StockQuoteServer.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/implementation/policies/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/spring/annotations/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
diff --git a/branches/sca-java-1.5/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
diff --git a/branches/sca-java-1.5/itest/transaction/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/pom.xml
diff --git a/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
diff --git a/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
diff --git a/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
diff --git a/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
diff --git a/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/transaction/src/main/resources/accounts.composite b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/resources/accounts.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/main/resources/accounts.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/resources/accounts.composite
diff --git a/branches/sca-java-1.5/itest/transaction/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/transaction/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/resources/log4j.properties
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/main/resources/log4j.properties
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/main/resources/log4j.properties
diff --git a/branches/sca-java-1.5/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
diff --git a/branches/sca-java-1.5/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/pom.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/Customer.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/Customer.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/Customer.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/Customer.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorClient.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorld.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/XsdValidation/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/XsdValidation/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/XsdValidation/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/XsdValidation/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/MissingImportedXSDTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
diff --git a/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
diff --git a/branches/sca-java-1.5/itest/wasAdmin.py b/sca-java-1.x/branches/sca-java-1.5/itest/wasAdmin.py
similarity index 100%
rename from branches/sca-java-1.5/itest/wasAdmin.py
rename to sca-java-1.x/branches/sca-java-1.5/itest/wasAdmin.py
diff --git a/branches/sca-java-1.5/itest/wires/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/wires/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/wires/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/wires/pom.xml
diff --git a/branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
diff --git a/branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
diff --git a/branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/sca-java-1.x/branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
diff --git a/branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/wires/src/main/resources/WireTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/wires/src/main/resources/WireTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/wires/src/main/resources/WireTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/wires/src/main/resources/WireTest.composite
diff --git a/branches/sca-java-1.5/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
diff --git a/branches/sca-java-1.5/itest/ws-void-args-return/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/ws-void-args-return/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/pom.xml
diff --git a/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/Bean.java b/sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
similarity index 100%
rename from branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
diff --git a/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
similarity index 100%
rename from branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
diff --git a/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
diff --git a/branches/sca-java-1.5/itest/ws-void-args-return/src/main/resources/voidtest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/main/resources/voidtest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/ws-void-args-return/src/main/resources/voidtest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/main/resources/voidtest.composite
diff --git a/branches/sca-java-1.5/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
diff --git a/branches/sca-java-1.5/itest/wsdl-multiple/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl-multiple/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/pom.xml
diff --git a/branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
diff --git a/branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
diff --git a/branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
diff --git a/branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
diff --git a/branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
diff --git a/branches/sca-java-1.5/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
diff --git a/branches/sca-java-1.5/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
diff --git a/branches/sca-java-1.5/itest/wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/pom.xml
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/resources/SDOWSDLTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/resources/SDOWSDLTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/resources/WSDLTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/resources/WSDLTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/resources/WSDLTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/resources/wsdl/Hello.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/resources/wsdl/Hello.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/resources/wsdl/Hello.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/resources/wsdl/Hello.xsd
diff --git a/branches/sca-java-1.5/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-java-1.5/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-java-1.5/itest/wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl2java/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl2java/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl2java/pom.xml
diff --git a/branches/sca-java-1.5/itest/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl2java/src/test/resources/AccountService.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl2java/src/test/resources/AccountService.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-1.5/itest/wsdl2java/src/test/resources/EchoService.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl2java/src/test/resources/EchoService.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl2java/src/test/resources/EchoService.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl2java/src/test/resources/EchoService.wsdl
diff --git a/branches/sca-java-1.5/itest/wsdl2java/src/test/resources/EchoService.xsd b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl2java/src/test/resources/EchoService.xsd
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl2java/src/test/resources/EchoService.xsd
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl2java/src/test/resources/EchoService.xsd
diff --git a/branches/sca-java-1.5/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.5/itest/wsdlgen/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlgen/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/pom.xml
diff --git a/branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/ABean.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/ABean.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/ABean.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/ABean.java
diff --git a/branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/package-info.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/package-info.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/package-info.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/java/helloworld/package-info.java
diff --git a/branches/sca-java-1.5/itest/wsdlgen/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlgen/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/itest/wsdlgen/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlgen/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/wsdlgen/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/resources/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlgen/src/main/resources/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/wsdlgen/src/test/java/helloworld/JmsTransportTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/test/java/helloworld/JmsTransportTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlgen/src/test/java/helloworld/JmsTransportTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlgen/src/test/java/helloworld/JmsTransportTestCase.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/pom.xml
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/service/AnObject.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/service/AnObject.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/service/AnObject.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/service/AnObject.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/service/MoreComplexObject.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/service/MoreComplexObject.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/service/MoreComplexObject.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/service/MoreComplexObject.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/service/SomeService.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/service/SomeService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/service/SomeService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/service/SomeService.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/java/service/SomeServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/resources/SDOWSDLTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/resources/WSDLTest.composite b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/resources/WSDLTest.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/resources/WSDLTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/resources/some.composite b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/resources/some.composite
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/resources/some.composite
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/resources/some.composite
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/AnObject.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/AnObject.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/AnObject.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/AnObject.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingString.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/SomeService.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/SomeService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/SomeService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/SomeService.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
diff --git a/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/package-info.java b/sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/package-info.java
similarity index 100%
rename from branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/package-info.java
rename to sca-java-1.x/branches/sca-java-1.5/itest/wsdlless/src/test/java/service/generated/package-info.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/LICENSE
diff --git a/branches/sca-java-1.5/modules/assembly-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/NOTICE
diff --git a/branches/sca-java-1.5/modules/assembly-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/pom.xml
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
diff --git a/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/LICENSE
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/NOTICE
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/pom.xml
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-all.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-all.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-all.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-all.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-contributions.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-core.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-core.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-core.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-core.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-definitions.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-jee.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-jee.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-jee.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-jee.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-policy.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-policy.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-policy.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca-policy.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/sca.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-core.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-core.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-core.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-core.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-corba.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-corba.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-corba.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-corba.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-gdata.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-gdata.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-gdata.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-gdata.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/ws-addr.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/ws-addr.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/ws-addr.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/ws-addr.xsd
diff --git a/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/wsdli.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/wsdli.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/wsdli.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly-xsd/src/main/resources/wsdli.xsd
diff --git a/branches/sca-java-1.5/modules/assembly/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/LICENSE
diff --git a/branches/sca-java-1.5/modules/assembly/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/NOTICE
diff --git a/branches/sca-java-1.5/modules/assembly/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/pom.xml
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultExtensionFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultExtensionFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultExtensionFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultExtensionFactory.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefinitionElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefinitionElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefinitionElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefinitionElement.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ExtensionFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ExtensionFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ExtensionFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ExtensionFactory.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.ExtensionFactory b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.ExtensionFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.ExtensionFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.ExtensionFactory
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/resources/assembly-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/resources/assembly-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/resources/assembly-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/resources/assembly-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/assembly/src/main/resources/assembly-validation-messages_it.properties b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
diff --git a/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/AtomTestCaseUtils.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/ReceiptToms.gif b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/ReceiptToms.gif
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/ReceiptToms.gif
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/ReceiptToms.gif
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/ReceiptValue.jpg b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/ReceiptValue.jpg
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/ReceiptValue.jpg
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/ReceiptValue.jpg
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
diff --git a/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-abdera/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
diff --git a/branches/sca-java-1.5/modules/binding-atom-js-dojo/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js-dojo/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-js-dojo/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js-dojo/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-atom-js-dojo/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js-dojo/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-js-dojo/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js-dojo/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-atom-js-dojo/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js-dojo/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-js-dojo/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js-dojo/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
diff --git a/branches/sca-java-1.5/modules/binding-atom-js/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-js/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-atom-js/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-js/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-atom-js/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-js/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-atom-js/src/main/java/org/apache/tuscany/sca/binding/atom/js/AtomBindingJavascriptProxyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js/src/main/java/org/apache/tuscany/sca/binding/atom/js/AtomBindingJavascriptProxyFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-js/src/main/java/org/apache/tuscany/sca/binding/atom/js/AtomBindingJavascriptProxyFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js/src/main/java/org/apache/tuscany/sca/binding/atom/js/AtomBindingJavascriptProxyFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-atom-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
diff --git a/branches/sca-java-1.5/modules/binding-atom-js/src/main/resources/binding-atom.js b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js/src/main/resources/binding-atom.js
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom-js/src/main/resources/binding-atom.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom-js/src/main/resources/binding-atom.js
diff --git a/branches/sca-java-1.5/modules/binding-atom/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-atom/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-atom/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
diff --git a/branches/sca-java-1.5/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/CorbaException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/CorbaException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/CorbaException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/CorbaException.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/RequestConfigurationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/RequestConfigurationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/RequestConfigurationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/exceptions/RequestConfigurationException.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaResponse.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaResponse.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaResponse.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaResponse.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceInstanceCreator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceInstanceCreator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceInstanceCreator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceInstanceCreator.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceMethodInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceMethodInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceMethodInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/InterfaceMethodInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationException.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/InvocationProxy.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/OperationTypes.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/AnnotationAttributes.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/AnnotationAttributes.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/AnnotationAttributes.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/AnnotationAttributes.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/NodeType.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/NodeType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/NodeType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/NodeType.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTree.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeNode.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeNode.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeNode.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeNode.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/UnionAttributes.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/UnionAttributes.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/UnionAttributes.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/UnionAttributes.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ArrayTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/BooleanTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ByteTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/CharTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/DoubleTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/EnumTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/FloatTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/IntTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/LongTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ReferenceTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/SequenceTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/ShortTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StringTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/StructTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/TypeHelpersProxy.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/UnionTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/UnionTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/UnionTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/UnionTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/util/Utils.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/MethodFinder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/util/OperationMapper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaArray.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaArray.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaArray.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaArray.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElement.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElementType.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElementType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElementType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/meta/CorbaUnionElementType.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/enums.idl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/enums.idl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/enums.idl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/enums.idl
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/exceptions.idl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/exceptions.idl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/exceptions.idl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/exceptions.idl
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/general_tests.idl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/general_tests.idl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/general_tests.idl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/general_tests.idl
diff --git a/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/references.idl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/references.idl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/references.idl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba-runtime/src/test/resources/references.idl
diff --git a/branches/sca-java-1.5/modules/binding-corba/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-corba/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-corba/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
diff --git a/branches/sca-java-1.5/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-dwr/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-dwr/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-dwr/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-dwr/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-dwr/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-dwr/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRBindingActivator.java
diff --git a/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRInvokerFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRService.java
diff --git a/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/java/org/apache/tuscany/sca/binding/dwr/DWRServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator b/sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-dwr/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/account/Customer.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/account/Customer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/account/Customer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/account/Customer.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceRemote.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceRemote.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceRemote.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceRemote.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/resources/account/account.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/resources/account/account.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/resources/account/account.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/resources/account/account.composite
diff --git a/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/resources/calculator-ejb/calculator-ejb.jar b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/resources/calculator-ejb/calculator-ejb.jar
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/resources/calculator-ejb/calculator-ejb.jar
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb-runtime/src/test/resources/calculator-ejb/calculator-ejb.jar
diff --git a/branches/sca-java-1.5/modules/binding-ejb/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-ejb/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
diff --git a/branches/sca-java-1.5/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/impl/ReadWriteAnyAttributeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/impl/ReadWriteAnyAttributeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/impl/ReadWriteAnyAttributeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ejb/src/test/java/org/apache/tuscany/sca/binding/ejb/impl/ReadWriteAnyAttributeTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNode.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNode.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNode.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNode.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNodeElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNodeElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNodeElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNodeElement.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/MessageHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/MessageHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/MessageHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/MessageHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ServiceExecutor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ServiceExecutor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ServiceExecutor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ServiceExecutor.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/TypeMismatchException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/TypeMismatchException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/TypeMismatchException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/TypeMismatchException.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/exceptions/ErlangException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/exceptions/ErlangException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/exceptions/ErlangException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/exceptions/ErlangException.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AnnotatedListTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AnnotatedListTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AnnotatedListTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AnnotatedListTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AtomTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AtomTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AtomTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AtomTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BinaryTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BinaryTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BinaryTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BinaryTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BooleanTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BooleanTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BooleanTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BooleanTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ByteTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ByteTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ByteTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ByteTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/CharTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/CharTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/CharTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/CharTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/DoubleTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/DoubleTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/DoubleTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/DoubleTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/FloatTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/FloatTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/FloatTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/FloatTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/IntTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/IntTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/IntTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/IntTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ListTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ListTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ListTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ListTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/LongTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/LongTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/LongTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/LongTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ShortTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ShortTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ShortTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ShortTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/StringTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/StringTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/StringTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/StringTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelpersProxy.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelpersProxy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelpersProxy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelpersProxy.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/meta/ErlangAtom.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/meta/ErlangAtom.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/meta/ErlangAtom.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/meta/ErlangAtom.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/AtomTuple.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/AtomTuple.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/AtomTuple.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/AtomTuple.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxInterface.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxListener.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ModuleInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ModuleInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ModuleInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ModuleInterface.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceServiceTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponent.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponent.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponentImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceInterface.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponent.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponent.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplClone.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplClone.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplClone.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplClone.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplTimeout.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplTimeout.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplTimeout.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplTimeout.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/SmallTuple.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/SmallTuple.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/SmallTuple.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/SmallTuple.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/StructuredTuple.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/StructuredTuple.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/StructuredTuple.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/StructuredTuple.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnorableRunner.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnorableRunner.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnorableRunner.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnorableRunner.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnoreTest.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnoreTest.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnoreTest.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnoreTest.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite
diff --git a/branches/sca-java-1.5/modules/binding-erlang/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-erlang/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-erlang/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/ErlangBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/ErlangBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/ErlangBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/ErlangBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/ErlangBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/ErlangBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/ErlangBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/ErlangBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-erlang/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.erlang.ErlangBindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.erlang.ErlangBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.erlang.ErlangBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.erlang.ErlangBindingFactory
diff --git a/branches/sca-java-1.5/modules/binding-erlang/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-erlang/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ErlangBindingProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ErlangBindingProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-erlang/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ErlangBindingProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-erlang/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ErlangBindingProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-feed/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-feed/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/AtomBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/RSSBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/Collection.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/MediaCollection.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/collection/NotFoundException.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/AtomBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/impl/RSSBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomFeedEntryUtil.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/AtomServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/RSSServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Consumer.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClient.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerClientImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/java/org/apache/tuscany/sca/binding/feed/Provider.java
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
diff --git a/branches/sca-java-1.5/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-feed/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/NotFoundException.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingUtil.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Consumer.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClient.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerClientImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleWebAlbumServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleWebAlbumServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleWebAlbumServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleWebAlbumServiceTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/log4j.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/log4j.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Consumer.composite
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleWebAlbum.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleWebAlbum.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleWebAlbum.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/ConsumerGoogleWebAlbum.composite
diff --git a/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/Provider.composite
diff --git a/branches/sca-java-1.5/modules/binding-gdata/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-gdata/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-gdata/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GdataBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
diff --git a/branches/sca-java-1.5/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelector.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelector.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelector.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelector.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelectorFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelectorFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelectorFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/JSONRPCOperationSelectorFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormat.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/JSONRPCWireFormatFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelectorFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelectorFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelectorFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelectorFactory
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormatFactory
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/impl/JSONRPCOperationSelectorProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-jsonrpc/src/test/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/impl/JSONRPCWireFormatProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPRRBListenerServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPRRBListenerServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPRRBListenerServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPRRBListenerServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/util/HTTPHeadersParser.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceCacheImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/resources/content/test.html
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/test/resources/content/test.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/resources/test.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/test/resources/test.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/resources/test.composite
diff --git a/branches/sca-java-1.5/modules/binding-http-runtime/src/test/resources/testCache.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/resources/testCache.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http-runtime/src/test/resources/testCache.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http-runtime/src/test/resources/testCache.composite
diff --git a/branches/sca-java-1.5/modules/binding-http/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-http/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-http/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingContext.java
diff --git a/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPCacheContext.java
diff --git a/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPHeader.java
diff --git a/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
diff --git a/branches/sca-java-1.5/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/JMSBindingDefinitionsProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationReferencePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationServicePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderReferencePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/binding-jms-policy-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-policy/src/test/resources/org/apache/tuscany/sca/binding/jms/policy/mock_policy_definitions.xml
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultMessageProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultMessageProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultMessageProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLBytesMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLBytesMessageProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLBytesMessageProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLBytesMessageProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/resources/simple/client.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/resources/simple/client.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/test/resources/simple/client.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/resources/simple/client.composite
diff --git a/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/resources/simple/service.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/resources/simple/service.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms-runtime/src/test/resources/simple/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms-runtime/src/test/resources/simple/service.composite
diff --git a/branches/sca-java-1.5/modules/binding-jms/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-jms/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/BindingProperty.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/BindingProperty.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/BindingProperty.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/BindingProperty.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingConstants.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingException.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefault.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/OperationSelectorJMSDefaultProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/OperationSelectorJMSUserProp.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/OperationSelectorJMSUserProp.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/OperationSelectorJMSUserProp.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/OperationSelectorJMSUserProp.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/OperationSelectorJMSUserPropProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/OperationSelectorJMSUserPropProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/OperationSelectorJMSUserPropProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/OperationSelectorJMSUserPropProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytes.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/WireFormatJMSBytesProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXML.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXMLProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXMLProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXMLProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/WireFormatJMSBytesXMLProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/WireFormatJMSDefault.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/WireFormatJMSDefault.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/WireFormatJMSDefault.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/WireFormatJMSDefault.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/WireFormatJMSDefaultProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/WireFormatJMSDefaultProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/WireFormatJMSDefaultProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/WireFormatJMSDefaultProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObject.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/WireFormatJMSObjectProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSText.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/WireFormatJMSTextProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXML.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/WireFormatJMSTextXMLProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/impl/JMSBindingProcessorWriteTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-js/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-js/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-js/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-js/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-js/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-js/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-js/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/JSONRPCBindingJavascriptProxyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/JSONRPCBindingJavascriptProxyFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-js/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/JSONRPCBindingJavascriptProxyFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/JSONRPCBindingJavascriptProxyFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-js/src/main/resources/binding-jsonrpc.js b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js/src/main/resources/binding-jsonrpc.js
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-js/src/main/resources/binding-jsonrpc.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-js/src/main/resources/binding-jsonrpc.js
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/ScaDomainScriptServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
diff --git a/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-notification/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-notification/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/DefaultNotificationBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBrokerManager.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManager.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBroker.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Broker.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReference.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerID.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReference.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Brokers.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverride.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponse.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Constants.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReference.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingException.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingObject.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingRegistry.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumers.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducers.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddress.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReference.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequence.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceSequenceEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapper.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceWrapperEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumers.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Neighbors.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBroker.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAck.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponse.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumer.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponse.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducer.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponse.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferenceProperties.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBroker.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBroker.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnection.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/Subscribe.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/SubscribeEnDeCoder.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
diff --git a/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
diff --git a/branches/sca-java-1.5/modules/binding-rmi/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-rmi/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-rmi/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
diff --git a/branches/sca-java-1.5/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Consumer.composite
diff --git a/branches/sca-java-1.5/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss-rome/src/test/resources/org/apache/tuscany/sca/binding/feed/Provider.composite
diff --git a/branches/sca-java-1.5/modules/binding-rss/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-rss/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-rss/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
diff --git a/branches/sca-java-1.5/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-corba/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-corba/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-corba/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-sca-jms/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-jms/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-sca-jms/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-jms/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-sca-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-jms/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQJMSResourceFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQJMSResourceFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQJMSResourceFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQJMSResourceFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQResourceFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQResourceFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQResourceFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/AMQResourceFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSBroker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSBroker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSBroker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSBroker.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSSCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSSCABindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSSCABindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/src/main/java/org/apache/tuscany/sca/binding/sca/jms/JMSSCABindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-xml/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-xml/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-xml/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadWriteAnyAttributeTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.5/modules/binding-sca/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-sca/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-sca/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-sca/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/test/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-sca/src/test/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-sca/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicyUtil.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyInterceptor.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeader.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeader.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeaderString.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeaderString.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeaderString.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2SOAPHeaderString.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/wspolicy/WSSecurityPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/wspolicy/WSSecurityPolicyHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/wspolicy/WSSecurityPolicyHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/wspolicy/WSSecurityPolicyHandler.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2-policy/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/mock_policies.xml
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceServlet.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyDispatcher.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/AxisJMSException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/AxisJMSException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/AxisJMSException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/AxisJMSException.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSConnectionFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSConnectionFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSConnectionFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSConnectionFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSListener.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSMessageReceiver.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSMessageReceiver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSMessageReceiver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSMessageReceiver.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSOutTransportInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSOutTransportInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSOutTransportInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSOutTransportInfo.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSSender.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSSender.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSSender.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/JMSSender.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/README b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/README
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/README
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/jms/README
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingBasicAuthenticationConfigurator.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingHeaderConfigurator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingHeaderConfigurator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingHeaderConfigurator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configurator/Axis2BindingHeaderConfigurator.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/services/services.list
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/Greeter.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/GreetingCallback.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Account.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/AccountService.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Bar.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/CustomerProfileData.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Echo.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoComponent.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/EchoImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/Foo.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldComponent.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldMultiService.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDLTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOM2.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMComponent.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMService.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldService.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldWSDLMergedTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLImportTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCaseFIXME.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCaseFIXME.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLIncludeTestCaseFIXME.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/QuestionMarkWSDLTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/UriPrecedenceTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiServiceTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleServiceTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURITestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURITestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferClient.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferMTOMTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferMTOMTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferMTOMTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferMTOMTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferService.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceClient.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceClient.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceClient.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/FileTransferServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/MyException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/MyException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/MyException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/MyException.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/MyExceptionAdapter.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/MyExceptionAdapter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/MyExceptionAdapter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/MyExceptionAdapter.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/MyExceptionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/MyExceptionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/MyExceptionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/MyExceptionImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/IntegrityPWCBHandler.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthenticationTestCaseFIXME.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrityTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/IntegrityPWCBHandler.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixedTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/AbstractHelloWorldOMTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/IntegrityPWCBHandler.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthenticationTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentialityTestCaseFIXBouncyCastleIssue.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrityTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12TestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorldNoWSDL.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdata.xsd
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerdefs.xsd
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/customerinfo.xsd
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultMultiService.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/DefaultSingleService.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLExplicitURI.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/WSDLRelativeURI.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/endpoints/helloworld-om-relative-uri.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-binding.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-merged.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-porttype.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om-uri.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-om.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld-prec.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/helloworld.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransfer.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransfer.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransfer.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransfer.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/mtom/filetransferservice.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityAuthentication.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityConfidentiality.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/WSSecurityIntegrity.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/security.properties
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/tuscanyKeys.jks
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/WSSecurityMixed.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/security.properties
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/tuscanyKeys.jks
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityAuthentication.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityConfidentiality.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/WSSecurityIntegrity.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import-nested.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-import.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl-include.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-wsdl.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/BindingBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadWriteAnyAttributeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadWriteAnyAttributeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadWriteAnyAttributeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadWriteAnyAttributeTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-java-1.5/modules/binding-ws/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/LICENSE
diff --git a/branches/sca-java-1.5/modules/binding-ws/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/NOTICE
diff --git a/branches/sca-java-1.5/modules/binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/pom.xml
diff --git a/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/DefaultWebServiceBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
diff --git a/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
diff --git a/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
diff --git a/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
diff --git a/branches/sca-java-1.5/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory b/sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
diff --git a/branches/sca-java-1.5/modules/contribution-groovy/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-groovy/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/LICENSE
diff --git a/branches/sca-java-1.5/modules/contribution-groovy/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-groovy/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/NOTICE
diff --git a/branches/sca-java-1.5/modules/contribution-groovy/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-groovy/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/pom.xml
diff --git a/branches/sca-java-1.5/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifact.java
diff --git a/branches/sca-java-1.5/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyArtifactProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/main/java/org/apache/tuscany/sca/contribution/groovy/GroovyModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.5/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorld.java
diff --git a/branches/sca-java-1.5/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/test/java/org/apache/tuscany/sca/contribution/groovy/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/HelloWorld.groovy
diff --git a/branches/sca-java-1.5/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-groovy/src/test/resources/org/apache/tuscany/sca/contribution/groovy/helloworld.composite
diff --git a/branches/sca-java-1.5/modules/contribution-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/LICENSE
diff --git a/branches/sca-java-1.5/modules/contribution-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/NOTICE
diff --git a/branches/sca-java-1.5/modules/contribution-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/pom.xml
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImplTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImplTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImplTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImplTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/repository3/contribution.zip b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/repository3/contribution.zip
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/resources/repository3/contribution.zip
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/repository3/contribution.zip
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/test.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/resources/test.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/test.composite
diff --git a/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/test.ext b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/test.ext
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-impl/src/test/resources/test.ext
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-impl/src/test/resources/test.ext
diff --git a/branches/sca-java-1.5/modules/contribution-java/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/LICENSE
diff --git a/branches/sca-java-1.5/modules/contribution-java/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/NOTICE
diff --git a/branches/sca-java-1.5/modules/contribution-java/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/pom.xml
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/ContributionClassLoaderProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/ContributionClassLoaderProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/ContributionClassLoaderProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/ContributionClassLoaderProvider.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/ContributionClassloaderProviderExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/ContributionClassloaderProviderExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/ContributionClassloaderProviderExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/ContributionClassloaderProviderExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultContributionClassLoaderProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultContributionClassLoaderProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultContributionClassLoaderProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultContributionClassLoaderProvider.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultContributionClassloaderProviderExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultContributionClassloaderProviderExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultContributionClassloaderProviderExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultContributionClassloaderProviderExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.ContributionClassLoaderProvider b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.ContributionClassLoaderProvider
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.ContributionClassLoaderProvider
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.ContributionClassLoaderProvider
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.ContributionClassloaderProviderExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.ContributionClassloaderProviderExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.ContributionClassloaderProviderExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.ContributionClassloaderProviderExtensionPoint
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-java-1.5/modules/contribution-jee-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee-impl/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/LICENSE
diff --git a/branches/sca-java-1.5/modules/contribution-jee-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee-impl/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/NOTICE
diff --git a/branches/sca-java-1.5/modules/contribution-jee-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee-impl/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/pom.xml
diff --git a/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEModuleHelper.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoader.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoader.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoaderProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoaderProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoaderProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EARContributionClassLoaderProvider.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEIntrospectorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEIntrospectorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEIntrospectorImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoader.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoader.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoaderProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoaderProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoaderProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WARContributionClassLoaderProvider.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.ContributionClassLoaderProvider b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.ContributionClassLoaderProvider
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.ContributionClassLoaderProvider
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.ContributionClassLoaderProvider
diff --git a/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEIntrospector
diff --git a/branches/sca-java-1.5/modules/contribution-jee/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/LICENSE
diff --git a/branches/sca-java-1.5/modules/contribution-jee/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/NOTICE
diff --git a/branches/sca-java-1.5/modules/contribution-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/pom.xml
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbInfo.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleInfo.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbModuleModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EjbReferenceInfo.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EnvEntryInfo.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ExternalEarInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ExternalEarInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ExternalEarInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ExternalEarInfo.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationInfo.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEApplicationModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEExtension.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEIntrospector.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JavaEEOptionalExtension.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/JspReferenceTagInfo.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObject.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObjectModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObjectModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObjectModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/ModelObjectModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleInfo.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EarContributionProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbArchiveProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/EjbModuleInfoImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEApplicationInfoImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEArchiveProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEExtensionImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/JavaEEOptionalExtensionImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/ModelObjectImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/ModelObjectImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/ModelObjectImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/ModelObjectImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WarContributionProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebArchiveProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/impl/WebModuleInfoImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEExtension b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEExtension
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEExtension
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEExtension
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.jee.JavaEEOptionalExtension
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/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/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/EarContributionProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/test/java/org/apache/tuscany/sca/contribution/jee/WarContributionProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/test/resources/ejb-injection-sample.ear
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/test/resources/ejb-injection-sample.jar
diff --git a/branches/sca-java-1.5/modules/contribution-jee/src/test/resources/sample-web-app.war b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/test/resources/sample-web-app.war
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-jee/src/test/resources/sample-web-app.war
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-jee/src/test/resources/sample-web-app.war
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/LICENSE
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/NOTICE
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/pom.xml
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportListener.java
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/main/resources/contribution-namespace-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-namespace/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/LICENSE
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/NOTICE
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/pom.xml
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.5/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.5/modules/contribution-resource/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/LICENSE
diff --git a/branches/sca-java-1.5/modules/contribution-resource/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/NOTICE
diff --git a/branches/sca-java-1.5/modules/contribution-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/pom.xml
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceExport.java
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImport.java
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/ResourceImportExportFactory.java
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportExportListener.java
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resource.ResourceImportExportFactory
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/main/resources/contribution-resource-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceExportProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-resource/src/test/java/org/apache/tuscany/sca/contribution/resource/impl/ResourceImportProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/LICENSE
diff --git a/branches/sca-java-1.5/modules/contribution-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/NOTICE
diff --git a/branches/sca-java-1.5/modules/contribution-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/pom.xml
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLDocumentStreamReader.java
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLEventsStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLEventsStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLEventsStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLEventsStreamReader.java
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLFragmentStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLFragmentStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLFragmentStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/XMLFragmentStreamReader.java
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/contribution/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/LICENSE
diff --git a/branches/sca-java-1.5/modules/contribution/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/NOTICE
diff --git a/branches/sca-java-1.5/modules/contribution/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/pom.xml
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyNamespaceContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyNamespaceContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyNamespaceContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyNamespaceContext.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyXMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyXMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyXMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
diff --git a/branches/sca-java-1.5/modules/contribution/src/main/resources/contribution-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/contribution-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/contribution/src/main/resources/contribution-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/contribution/src/main/resources/contribution-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/core-databinding/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/LICENSE
diff --git a/branches/sca-java-1.5/modules/core-databinding/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/NOTICE
diff --git a/branches/sca-java-1.5/modules/core-databinding/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/pom.xml
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/OMElementXMLAdapter.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/OMElementXMLAdapter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/OMElementXMLAdapter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/OMElementXMLAdapter.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
diff --git a/branches/sca-java-1.5/modules/core-spi/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/LICENSE
diff --git a/branches/sca-java-1.5/modules/core-spi/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/NOTICE
diff --git a/branches/sca-java-1.5/modules/core-spi/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/pom.xml
diff --git a/branches/sca-java-1.5/modules/core-spi/src/doc/Context Model.emx b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/doc/Context Model.emx
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/doc/Context Model.emx
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProviderRRB.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProviderRRB.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
diff --git a/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/branches/sca-java-1.5/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
diff --git a/branches/sca-java-1.5/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/core/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/core/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/LICENSE
diff --git a/branches/sca-java-1.5/modules/core/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/core/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/core/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/NOTICE
diff --git a/branches/sca-java-1.5/modules/core/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/core/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/core/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/pom.xml
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkScheduler.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Work.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEvent.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItem.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkListener.java
diff --git a/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
diff --git a/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
diff --git a/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
diff --git a/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-java-1.5/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
similarity index 100%
rename from branches/sca-java-1.5/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
rename to sca-java-1.x/branches/sca-java-1.5/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
diff --git a/branches/sca-java-1.5/modules/data-api/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/LICENSE
diff --git a/branches/sca-java-1.5/modules/data-api/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/NOTICE
diff --git a/branches/sca-java-1.5/modules/data-api/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/pom.xml
diff --git a/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
diff --git a/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
diff --git a/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
diff --git a/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
diff --git a/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
diff --git a/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
diff --git a/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
diff --git a/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
diff --git a/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
diff --git a/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
diff --git a/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
diff --git a/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java b/sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/LICENSE
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/NOTICE
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/pom.xml
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/test/resources/ipo.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/test/resources/ipo.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/test/resources/ipo.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/test/resources/ipo.xml
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/test/resources/ipo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/test/resources/ipo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.5/modules/databinding-axiom/src/test/resources/order.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/test/resources/order.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-axiom/src/test/resources/order.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-axiom/src/test/resources/order.wsdl
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/LICENSE
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/NOTICE
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/pom.xml
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2Node.java
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2SAX.java
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfoset2XMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/Node2FastInfoset.java
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLInputStream2FastInfoset.java
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/java/org/apache/tuscany/sca/databinding/fastinfoset/XMLStreamReader2FastInfoset.java
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/test/java/org/apache/tuscany/sca/databinding/fastinfoset/FastInfosetTransformerTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-fastinfoset/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-fastinfoset/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb-axiom/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb-axiom/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/LICENSE
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb-axiom/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb-axiom/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/NOTICE
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb-axiom/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/pom.xml
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBCustomBuilder.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/LICENSE
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/NOTICE
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/pom.xml
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/BeanXMLStreamReaderImpl.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2XMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-jaxb/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/resources/ipo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-jaxb/src/test/resources/ipo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-jaxb/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.5/modules/databinding-json/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/LICENSE
diff --git a/branches/sca-java-1.5/modules/databinding-json/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/NOTICE
diff --git a/branches/sca-java-1.5/modules/databinding-json/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/pom.xml
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-json/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/resources/ipo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-json/src/test/resources/ipo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-json/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/LICENSE
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/NOTICE
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/pom.xml
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/DataObject2NodeInfoTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/ItemList2ObjectTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Node2NodeInfoTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2DataObjectTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2JavaArrayTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/NodeInfo2NodeTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Object2ValueTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonDataBindingHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonNodeDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SaxonValueDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/SimpleType2ValueTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2JavaArray.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2ObjectTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/Value2SimpleTypeTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/java/org/apache/tuscany/sca/databinding/saxon/collection/ItemList.java
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.5/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-saxon/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/LICENSE
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/NOTICE
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/pom.xml
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/LICENSE
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/NOTICE
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/pom.xml
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/ipo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/ipo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/stock.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/stock.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/stock.xsd
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/wrapper.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/wrapper.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/wrapper.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/wrapper.xml
diff --git a/branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/wrapper.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/wrapper.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/wrapper.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-sdo/src/test/resources/wrapper.xsd
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/LICENSE
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/NOTICE
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/pom.xml
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/Node2XmlObject.java
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLBeansWrapperHandler.java
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2Node.java
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObject2XMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/test/java/org/apache/tuscany/sca/databinding/xmlbeans/XmlObjectTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.5/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xmlbeans/src/test/resources/ipo.xsdconfig
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/LICENSE
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/NOTICE
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/pom.xml
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObject.java
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/MetaObjectImpl.java
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Node2XObject.java
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/OMElement2XObject.java
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/Utils.java
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject.java
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2Node.java
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObject2OMElement.java
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/java/org/apache/tuscany/sca/databinding/xstream/XObjectDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/test/resources/ipo.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/test/resources/ipo.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/test/resources/ipo.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/test/resources/ipo.xml
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/test/resources/ipo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/test/resources/ipo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/test/resources/ipo.xsd
diff --git a/branches/sca-java-1.5/modules/databinding-xstream/src/test/resources/order.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/test/resources/order.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding-xstream/src/test/resources/order.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding-xstream/src/test/resources/order.wsdl
diff --git a/branches/sca-java-1.5/modules/databinding/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/LICENSE
diff --git a/branches/sca-java-1.5/modules/databinding/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/NOTICE
diff --git a/branches/sca-java-1.5/modules/databinding/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/pom.xml
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
diff --git a/branches/sca-java-1.5/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
diff --git a/branches/sca-java-1.5/modules/definitions-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions-xml/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/LICENSE
diff --git a/branches/sca-java-1.5/modules/definitions-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions-xml/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/NOTICE
diff --git a/branches/sca-java-1.5/modules/definitions-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions-xml/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/pom.xml
diff --git a/branches/sca-java-1.5/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
diff --git a/branches/sca-java-1.5/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
diff --git a/branches/sca-java-1.5/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java b/sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
diff --git a/branches/sca-java-1.5/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.5/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
diff --git a/branches/sca-java-1.5/modules/definitions/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/definitions/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions/LICENSE
diff --git a/branches/sca-java-1.5/modules/definitions/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/definitions/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions/NOTICE
diff --git a/branches/sca-java-1.5/modules/definitions/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/definitions/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions/pom.xml
diff --git a/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java b/sca-java-1.x/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
diff --git a/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java b/sca-java-1.x/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
diff --git a/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java b/sca-java-1.x/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
diff --git a/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
diff --git a/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/LICENSE
diff --git a/branches/sca-java-1.5/modules/domain-manager/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/NOTICE
diff --git a/branches/sca-java-1.5/modules/domain-manager/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/pom.xml
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfiguration.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerConfigurationImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/launcher/DomainManagerLauncherBootstrap.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/DomainManager.composite b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/DomainManager.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/DomainManager.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/DomainManager.composite
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/cloud-gadget.html b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/cloud-gadget.html
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/cloud-gadget.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/cloud-gadget.html
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/cloud.html b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/cloud.html
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/cloud.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/cloud.html
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/composite-gadget.html b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/composite-gadget.html
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/composite-gadget.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/composite-gadget.html
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/composite.html b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/composite.html
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/composite.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/composite.html
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/files-gadget.html b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/files-gadget.html
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/files-gadget.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/files-gadget.html
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/files.html b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/files.html
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/files.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/files.html
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/home-gadget.html b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/home-gadget.html
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/home-gadget.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/home-gadget.html
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/home.html b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/home.html
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/home.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/home.html
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/icons/feed-icon.png b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/icons/feed-icon.png
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/icons/feed-icon.png
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/icons/feed-icon.png
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/manager.css b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/manager.css
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/manager.css
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/manager.css
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/toolbar-gadget.html b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/toolbar-gadget.html
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/toolbar-gadget.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/toolbar-gadget.html
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/utils.js b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/utils.js
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/utils.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/utils.js
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/workspace-gadget.html b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/workspace-gadget.html
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/workspace-gadget.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/workspace-gadget.html
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/resources/workspace.html b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/workspace.html
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/main/resources/workspace.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/main/resources/workspace.html
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/test/resources/contributions/store/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/test/resources/workspace.xml b/sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/test/resources/workspace.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/domain-manager/src/test/resources/workspace.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/domain-manager/src/test/resources/workspace.xml
diff --git a/branches/sca-java-1.5/modules/endpoint/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/LICENSE
diff --git a/branches/sca-java-1.5/modules/endpoint/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/NOTICE
diff --git a/branches/sca-java-1.5/modules/endpoint/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/pom.xml
diff --git a/branches/sca-java-1.5/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-java-1.5/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
diff --git a/branches/sca-java-1.5/modules/endpoint/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/endpoint/src/test/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/endpoint/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/modules/extensibility-equinox/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-equinox/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/LICENSE
diff --git a/branches/sca-java-1.5/modules/extensibility-equinox/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-equinox/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/NOTICE
diff --git a/branches/sca-java-1.5/modules/extensibility-equinox/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-equinox/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/pom.xml
diff --git a/branches/sca-java-1.5/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
diff --git a/branches/sca-java-1.5/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
diff --git a/branches/sca-java-1.5/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
diff --git a/branches/sca-java-1.5/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
diff --git a/branches/sca-java-1.5/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
diff --git a/branches/sca-java-1.5/modules/extensibility-equinox/src/test/resources/test-bundle.jar b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/src/test/resources/test-bundle.jar
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-equinox/src/test/resources/test-bundle.jar
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-equinox/src/test/resources/test-bundle.jar
diff --git a/branches/sca-java-1.5/modules/extensibility-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-osgi/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/LICENSE
diff --git a/branches/sca-java-1.5/modules/extensibility-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-osgi/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/NOTICE
diff --git a/branches/sca-java-1.5/modules/extensibility-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-osgi/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/pom.xml
diff --git a/branches/sca-java-1.5/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java
diff --git a/branches/sca-java-1.5/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoveryActivator.java
diff --git a/branches/sca-java-1.5/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/src/test/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscovererTestCase.java
diff --git a/branches/sca-java-1.5/modules/extensibility-osgi/src/test/resources/test-bundle.jar b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/src/test/resources/test-bundle.jar
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility-osgi/src/test/resources/test-bundle.jar
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility-osgi/src/test/resources/test-bundle.jar
diff --git a/branches/sca-java-1.5/modules/extensibility/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/LICENSE
diff --git a/branches/sca-java-1.5/modules/extensibility/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/NOTICE
diff --git a/branches/sca-java-1.5/modules/extensibility/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/pom.xml
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderServiceDiscoverer.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderServiceDiscoverer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderServiceDiscoverer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderServiceDiscoverer.java
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
diff --git a/branches/sca-java-1.5/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
diff --git a/branches/sca-java-1.5/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ClassLoaderServiceDiscovererTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ClassLoaderServiceDiscovererTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ClassLoaderServiceDiscovererTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ClassLoaderServiceDiscovererTestCase.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/LICENSE
diff --git a/branches/sca-java-1.5/modules/extension-helper/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/NOTICE
diff --git a/branches/sca-java-1.5/modules/extension-helper/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/pom.xml
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/BindingActivator.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ComponentLifecycle.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/ImplementationActivator.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/InvokerFactory.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingSCDLProcessor.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/BindingsActivator.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/DiscoveryUtils.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/ImplementationsActivator.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoBinding.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/PojoImplementation.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/impl/SCDLProcessor.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractBinding.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractImplementation.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/AbstractStAXArtifactProcessor.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DefaultPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/DynamicImplementation.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/PropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/java/org/apache/tuscany/sca/extension/helper/utils/ResourceHelper.java
diff --git a/branches/sca-java-1.5/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/extension-helper/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/host-android/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-android/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-android/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/java/sample/Helloworld.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/sample/Helloworld.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/java/sample/Helloworld.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/java/sample/Helloworld.java
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/resources/helloworld.jar b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/resources/helloworld.jar
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/resources/helloworld.jar
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/resources/helloworld.jar
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/resources/helloworld.zip b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/resources/helloworld.zip
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/resources/helloworld.zip
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/resources/helloworld.zip
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/resources/test.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/resources/test.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/resources/test.composite
diff --git a/branches/sca-java-1.5/modules/host-android/src/test/resources/test.txt b/sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/resources/test.txt
similarity index 100%
rename from branches/sca-java-1.5/modules/host-android/src/test/resources/test.txt
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-android/src/test/resources/test.txt
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/CorbaRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jee/src/test/resources/general.idl b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/resources/general.idl
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jee/src/test/resources/general.idl
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jee/src/test/resources/general.idl
diff --git a/branches/sca-java-1.5/modules/host-corba-jse-tns/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse-tns/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-corba-jse-tns/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse-tns/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-corba-jse-tns/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse-tns/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/CorbaRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
diff --git a/branches/sca-java-1.5/modules/host-corba-jse/src/test/resources/general.idl b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/resources/general.idl
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba-jse/src/test/resources/general.idl
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba-jse/src/test/resources/general.idl
diff --git a/branches/sca-java-1.5/modules/host-corba/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-corba/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-corba/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
diff --git a/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
diff --git a/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
diff --git a/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
diff --git a/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
diff --git a/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
diff --git a/branches/sca-java-1.5/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
diff --git a/branches/sca-java-1.5/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-ejb/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-ejb/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-ejb/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-ejb/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-ejb/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHost.java
diff --git a/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHostExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHostExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBHostExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBRegistrationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBRegistrationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBRegistrationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBRegistrationException.java
diff --git a/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBSessionBean.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBSessionBean.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBSessionBean.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/EJBSessionBean.java
diff --git a/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/ExtensibleEJBHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/ExtensibleEJBHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/ExtensibleEJBHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/ExtensibleEJBHost.java
diff --git a/branches/sca-java-1.5/modules/host-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.ejb.EJBHostExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.ejb.EJBHostExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/host-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.ejb.EJBHostExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.ejb.EJBHostExtensionPoint
diff --git a/branches/sca-java-1.5/modules/host-embedded/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-embedded/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-embedded/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainZipsTestCaseFIXME.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/java/sample/Helloworld.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/sample/Helloworld.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/java/sample/Helloworld.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/java/sample/Helloworld.java
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/resources/helloworld.jar b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/resources/helloworld.jar
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/resources/helloworld.jar
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/resources/helloworld.jar
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/resources/helloworld.zip b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/resources/helloworld.zip
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/resources/helloworld.zip
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/resources/helloworld.zip
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/resources/test.composite b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/resources/test.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/resources/test.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/resources/test.composite
diff --git a/branches/sca-java-1.5/modules/host-embedded/src/test/resources/test.txt b/sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/resources/test.txt
similarity index 100%
rename from branches/sca-java-1.5/modules/host-embedded/src/test/resources/test.txt
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-embedded/src/test/resources/test.txt
diff --git a/branches/sca-java-1.5/modules/host-http/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-http/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-http/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-http/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-http/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-http/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-http/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-http/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-http/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-http/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-http/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-http/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
diff --git a/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
diff --git a/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/SecurityContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/SecurityContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/SecurityContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/SecurityContext.java
diff --git a/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
diff --git a/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
diff --git a/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/UserContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/UserContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/UserContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/UserContext.java
diff --git a/branches/sca-java-1.5/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
diff --git a/branches/sca-java-1.5/modules/host-jetty/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jetty/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-jetty/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jetty/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-jetty/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jetty/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
diff --git a/branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
diff --git a/branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
diff --git a/branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-jetty/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/test/resources/content/test.html
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jetty/src/test/resources/content/test.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.5/modules/host-jetty/src/test/resources/tuscany.keyStore b/sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/test/resources/tuscany.keyStore
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jetty/src/test/resources/tuscany.keyStore
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jetty/src/test/resources/tuscany.keyStore
diff --git a/branches/sca-java-1.5/modules/host-jms-asf/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms-asf/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-jms-asf/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms-asf/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-jms-asf/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms-asf/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ASFListener.java
diff --git a/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSHostExtensionPointImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSHostExtensionPointImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSHostExtensionPointImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSHostExtensionPointImpl.java
diff --git a/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/JMSServiceListenerFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/src/main/java/org/apache/tuscany/sca/host/jms/asf/ServiceInvoker.java
diff --git a/branches/sca-java-1.5/modules/host-jms-asf/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.jms.JMSHostExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.jms.JMSHostExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms-asf/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.jms.JMSHostExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms-asf/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.jms.JMSHostExtensionPoint
diff --git a/branches/sca-java-1.5/modules/host-jms/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-jms/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSHostExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSHostExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSHostExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListener.java
diff --git a/branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerDetails.java
diff --git a/branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-jms/src/main/java/org/apache/tuscany/sca/host/jms/JMSServiceListenerFactory.java
diff --git a/branches/sca-java-1.5/modules/host-openejb/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-openejb/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-openejb/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-openejb/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-openejb/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-openejb/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBRuntimeModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBRuntimeModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java
diff --git a/branches/sca-java-1.5/modules/host-openejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/host-openejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/host-openejb/src/test/java/org/apache/tuscany/sca/host/openejb/OpenEJBServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/src/test/java/org/apache/tuscany/sca/host/openejb/OpenEJBServerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-openejb/src/test/java/org/apache/tuscany/sca/host/openejb/OpenEJBServerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-openejb/src/test/java/org/apache/tuscany/sca/host/openejb/OpenEJBServerTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-rmi/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-rmi/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-rmi/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-rmi/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-rmi/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-rmi/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
diff --git a/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
diff --git a/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
diff --git a/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
diff --git a/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
diff --git a/branches/sca-java-1.5/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
diff --git a/branches/sca-java-1.5/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-tomcat/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-tomcat/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-tomcat/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-tomcat/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-tomcat/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-tomcat/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/ServletWrapper.java
diff --git a/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatDefaultServlet.java
diff --git a/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatPolicyBaseRealm.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatPolicyBaseRealm.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatPolicyBaseRealm.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatPolicyBaseRealm.java
diff --git a/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
diff --git a/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java
diff --git a/branches/sca-java-1.5/modules/host-tomcat/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/test/resources/content/test.html
similarity index 100%
rename from branches/sca-java-1.5/modules/host-tomcat/src/test/resources/content/test.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.5/modules/host-tomcat/src/test/resources/tuscany.keyStore b/sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/test/resources/tuscany.keyStore
similarity index 100%
rename from branches/sca-java-1.5/modules/host-tomcat/src/test/resources/tuscany.keyStore
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-tomcat/src/test/resources/tuscany.keyStore
diff --git a/branches/sca-java-1.5/modules/host-webapp/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/LICENSE
diff --git a/branches/sca-java-1.5/modules/host-webapp/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/NOTICE
diff --git a/branches/sca-java-1.5/modules/host-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/pom.xml
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebSCADomain.java
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTEI.java
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/resources/META-INF/sca.tld b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/resources/META-INF/sca.tld
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/resources/META-INF/sca.tld
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/resources/META-INF/sca.tld
diff --git a/branches/sca-java-1.5/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/helloworld/greetings.wsdl
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/log4j.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/log4j.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel-ode/src/test/resources/log4j.properties
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-java-1.5/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/EJBImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/impl/EJBImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/java/org/apache/tuscany/sca/implementation/ejb/xml/EJBImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.ejb.EJBImplementationFactory
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/main/resources/impl-ejb-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/test/java/org/apache/tuscany/sca/implementation/ejb/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-ejb/src/test/resources/org/apache/tuscany/sca/implementation/ejb/xml/TestEJB.composite
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
diff --git a/branches/sca-java-1.5/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
diff --git a/branches/sca-java-1.5/modules/implementation-java/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-java/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-java/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-jee/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-jee/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-jee/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/JEEImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/impl/JEEImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/java/org/apache/tuscany/sca/implementation/jee/xml/JEEImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jee.JEEImplementationFactory
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/ReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/ReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/WriteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/WriteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/test/java/org/apache/tuscany/sca/implementation/jee/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/test/java/test/Helloworld.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/test/java/test/Helloworld.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/test/java/test/Helloworld.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/test/java/test/Helloworld.java
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/test/java/test/MockImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/test/java/test/MockImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/test/java/test/MockImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/test/java/test/MockImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/test/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/test/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/test/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/test/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.5/modules/implementation-jee/src/test/resources/org/apache/tuscany/sca/implementation/jee/xml/TestJEE.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/test/resources/org/apache/tuscany/sca/implementation/jee/xml/TestJEE.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-jee/src/test/resources/org/apache/tuscany/sca/implementation/jee/xml/TestJEE.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-jee/src/test/resources/org/apache/tuscany/sca/implementation/jee/xml/TestJEE.composite
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/src/test/resources/TestComposite.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
diff --git a/branches/sca-java-1.5/modules/implementation-node-runtime/src/test/resources/TestNode.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/test/resources/TestNode.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node-runtime/src/test/resources/TestNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node-runtime/src/test/resources/TestNode.composite
diff --git a/branches/sca-java-1.5/modules/implementation-node/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-node/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-node/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
diff --git a/branches/sca-java-1.5/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
diff --git a/branches/sca-java-1.5/modules/implementation-notification/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-notification/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/DefaultNotificationImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/ImmutableMessage.java
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationComponentTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/test/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationLoaderTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-notification/src/test/resources/TrafficAdvisoryNotificationTestCase.componentType
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiAnnotations.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyInjector.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/context/OSGiPropertyValueObjectFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiInstanceWrapper.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiRemotableInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiPropertyTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestBundles.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestInterface.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/test/OSGiTestWithPropertyImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/resources/OSGiTestService.componentType
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/test/resources/osgiproptest.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/resources/osgiproptest.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/test/resources/osgiproptest.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/resources/osgiproptest.composite
diff --git a/branches/sca-java-1.5/modules/implementation-osgi/src/test/resources/osgitest.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/resources/osgitest.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-osgi/src/test/resources/osgitest.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-osgi/src/test/resources/osgitest.composite
diff --git a/branches/sca-java-1.5/modules/implementation-resource-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-resource-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-resource-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/GetResourceInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/java/org/apache/tuscany/sca/implementation/resource/provider/ResourceImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.5/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/test/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-resource-runtime/src/test/resources/content/test.html b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/test/resources/content/test.html
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource-runtime/src/test/resources/content/test.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/test/resources/content/test.html
diff --git a/branches/sca-java-1.5/modules/implementation-resource-runtime/src/test/resources/resource.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/test/resources/resource.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource-runtime/src/test/resources/resource.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource-runtime/src/test/resources/resource.composite
diff --git a/branches/sca-java-1.5/modules/implementation-resource/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-resource/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
diff --git a/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/ResourceImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/impl/ResourceImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory
diff --git a/branches/sca-java-1.5/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-resource/src/main/resources/impl-resource-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/implementation-script/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-script/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-script/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationActivator.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/engines/TuscanyJRubyScriptEngine.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRefTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptDynamicRef.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworldProxy.js
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScripInlineHelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
diff --git a/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/README b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/README
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/README
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/README
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas
diff --git a/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring-runtime/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
diff --git a/branches/sca-java-1.5/modules/implementation-spring/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-spring/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-spring/README b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/README
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/README
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/README
diff --git a/branches/sca-java-1.5/modules/implementation-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ComponentContextServlet.java
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/ContextScriptProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/DefaultContextScriptProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/JSONRPCScripProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/JSONRPCScripProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/JSONRPCScripProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/JSONRPCScripProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.ContextScriptProcessorExtensionPoint
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/resources/jsonrpc.js b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/resources/jsonrpc.js
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web-runtime/src/main/resources/jsonrpc.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web-runtime/src/main/resources/jsonrpc.js
diff --git a/branches/sca-java-1.5/modules/implementation-web/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-web/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-web/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/PropertyProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/introspect/ReferenceProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory
diff --git a/branches/sca-java-1.5/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/main/java/org/apache/tuscany/sca/implementation/widget/tuscany/TuscanyJavaScriptComponentGeneratorImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationTestCase.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/store/Catalog.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/store/Catalog.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/store/Catalog.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/store/Catalog.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/store/CatalogImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/store/CatalogImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/store/CatalogImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/store/CatalogImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/store/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/store/ShoppingCartImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/store/ShoppingCartImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/java/store/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/content/store.html b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/content/store.html
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/content/store.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/content/store.html
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/content/storeJS.html b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/content/storeJS.html
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/content/storeJS.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/content/storeJS.html
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/content/unitTests.html b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/content/unitTests.html
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/content/unitTests.html
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/content/unitTests.html
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/widget.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/widget.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/widget.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/widget.composite
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/widgetJS.composite b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/widgetJS.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/widgetJS.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime-tuscany/src/test/resources/widgetJS.composite
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptGenerator.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptGenerator.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/resources/atomModel.js b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/resources/atomModel.js
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/resources/atomModel.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/resources/atomModel.js
diff --git a/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/resources/binding-http.js b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/resources/binding-http.js
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/resources/binding-http.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget-runtime/src/main/resources/binding-http.js
diff --git a/branches/sca-java-1.5/modules/implementation-widget/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-widget/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-widget/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
diff --git a/branches/sca-java-1.5/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/LICENSE
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/NOTICE
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/pom.xml
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementation.java
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProvider.java
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvokationException.java
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/XQueryInvoker.java
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/impl/XQueryImplementationImpl.java
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryImplementationProcessor.java
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/java/org/apache/tuscany/sca/implementation/xquery/xml/XQueryIntrospector.java
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.5/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/implementation-xquery/src/main/resources/impl-xquery-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/LICENSE
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/NOTICE
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/pom.xml
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
diff --git a/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-java-1.5/modules/interface-java-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-xml/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/LICENSE
diff --git a/branches/sca-java-1.5/modules/interface-java-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-xml/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/NOTICE
diff --git a/branches/sca-java-1.5/modules/interface-java-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-xml/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/pom.xml
diff --git a/branches/sca-java-1.5/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
diff --git a/branches/sca-java-1.5/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.5/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
diff --git a/branches/sca-java-1.5/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-1.5/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.5/modules/interface-java/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/LICENSE
diff --git a/branches/sca-java-1.5/modules/interface-java/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/NOTICE
diff --git a/branches/sca-java-1.5/modules/interface-java/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/pom.xml
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
diff --git a/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/LICENSE
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/NOTICE
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/pom.xml
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELPartnerLinkTypeExt.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/main/resources/interface-wsdlxml-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/policy/stockquote_policy.wsdl
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-interface.wsdl
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/wsdl/helloworld-service.wsdl
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/xsd/greeting.xsd
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/xsd/helloworld.xsd
diff --git a/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl-xml/src/test/resources/xsd/name.xsd
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/LICENSE
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/NOTICE
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/pom.xml
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
diff --git a/branches/sca-java-1.5/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory b/sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
diff --git a/branches/sca-java-1.5/modules/interface/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/interface/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/LICENSE
diff --git a/branches/sca-java-1.5/modules/interface/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/interface/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/NOTICE
diff --git a/branches/sca-java-1.5/modules/interface/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/interface/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/pom.xml
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ParameterMode.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ParameterMode.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ParameterMode.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ParameterMode.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/branches/sca-java-1.5/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
diff --git a/branches/sca-java-1.5/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
diff --git a/branches/sca-java-1.5/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
diff --git a/branches/sca-java-1.5/modules/monitor/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/monitor/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/monitor/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/monitor/LICENSE
diff --git a/branches/sca-java-1.5/modules/monitor/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/monitor/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/monitor/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/monitor/NOTICE
diff --git a/branches/sca-java-1.5/modules/monitor/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/monitor/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/monitor/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/monitor/pom.xml
diff --git a/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java b/sca-java-1.x/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
diff --git a/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
diff --git a/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java b/sca-java-1.x/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
similarity index 100%
rename from branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
diff --git a/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java
diff --git a/branches/sca-java-1.5/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory b/sca-java-1.x/branches/sca-java-1.5/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
diff --git a/branches/sca-java-1.5/modules/node-api/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/node-api/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/node-api/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-api/LICENSE
diff --git a/branches/sca-java-1.5/modules/node-api/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/node-api/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/node-api/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-api/NOTICE
diff --git a/branches/sca-java-1.5/modules/node-api/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/node-api/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/node-api/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-api/pom.xml
diff --git a/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
diff --git a/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
diff --git a/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
diff --git a/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
diff --git a/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
diff --git a/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
diff --git a/branches/sca-java-1.5/modules/node-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/LICENSE
diff --git a/branches/sca-java-1.5/modules/node-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/NOTICE
diff --git a/branches/sca-java-1.5/modules/node-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/pom.xml
diff --git a/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java
diff --git a/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
diff --git a/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java
diff --git a/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java
diff --git a/branches/sca-java-1.5/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory
diff --git a/branches/sca-java-1.5/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory
diff --git a/branches/sca-java-1.5/modules/node-impl/src/test/java/hello/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/test/java/hello/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/test/java/hello/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-java-1.5/modules/node-impl/src/test/java/hello/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
diff --git a/branches/sca-java-1.5/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
diff --git a/branches/sca-java-1.5/modules/node-impl/src/test/resources/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/test/resources/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/test/resources/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/LICENSE
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/NOTICE
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/pom.xml
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java
diff --git a/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-java-1.5/modules/node-launcher/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/LICENSE
diff --git a/branches/sca-java-1.5/modules/node-launcher/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/NOTICE
diff --git a/branches/sca-java-1.5/modules/node-launcher/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/pom.xml
diff --git a/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
diff --git a/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
diff --git a/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
diff --git a/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
diff --git a/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
diff --git a/branches/sca-java-1.5/modules/node-manager/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/node-manager/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/node-manager/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-manager/LICENSE
diff --git a/branches/sca-java-1.5/modules/node-manager/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/node-manager/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/node-manager/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-manager/NOTICE
diff --git a/branches/sca-java-1.5/modules/node-manager/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/node-manager/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/node-manager/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-manager/pom.xml
diff --git a/branches/sca-java-1.5/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeManagerUtil.java
diff --git a/branches/sca-java-1.5/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/NodeProcessCollectionImpl.java
diff --git a/branches/sca-java-1.5/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-manager/src/main/java/org/apache/tuscany/sca/implementation/node/manager/PingServiceImpl.java
diff --git a/branches/sca-java-1.5/modules/node-manager/src/main/resources/NodeDaemon.composite b/sca-java-1.x/branches/sca-java-1.5/modules/node-manager/src/main/resources/NodeDaemon.composite
similarity index 100%
rename from branches/sca-java-1.5/modules/node-manager/src/main/resources/NodeDaemon.composite
rename to sca-java-1.x/branches/sca-java-1.5/modules/node-manager/src/main/resources/NodeDaemon.composite
diff --git a/branches/sca-java-1.5/modules/osgi-runtime/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/osgi-runtime/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/LICENSE
diff --git a/branches/sca-java-1.5/modules/osgi-runtime/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/osgi-runtime/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/NOTICE
diff --git a/branches/sca-java-1.5/modules/osgi-runtime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/osgi-runtime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/pom.xml
diff --git a/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java b/sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
similarity index 100%
rename from branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/EquinoxRuntime.java
diff --git a/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java b/sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
similarity index 100%
rename from branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
diff --git a/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java b/sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
similarity index 100%
rename from branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/KnopflerfishRuntime.java
diff --git a/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
diff --git a/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java b/sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
similarity index 100%
rename from branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
diff --git a/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/osgi-runtime/src/test/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntimeTestCase.java
diff --git a/branches/sca-java-1.5/modules/policy-logging/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/LICENSE
diff --git a/branches/sca-java-1.5/modules/policy-logging/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/NOTICE
diff --git a/branches/sca-java-1.5/modules/policy-logging/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/pom.xml
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
diff --git a/branches/sca-java-1.5/modules/policy-reliability/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-reliability/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-reliability/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-reliability/LICENSE
diff --git a/branches/sca-java-1.5/modules/policy-reliability/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-reliability/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-reliability/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-reliability/NOTICE
diff --git a/branches/sca-java-1.5/modules/policy-reliability/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-reliability/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-reliability/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-reliability/pom.xml
diff --git a/branches/sca-java-1.5/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-reliability/src/main/java/org/apache/tuscany/sca/policy/reliability/ReliabilityPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.5/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-reliability/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.5/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-reliability/src/main/resources/org/apache/tuscany/sca/policy/reliability/definitions.xml
diff --git a/branches/sca-java-1.5/modules/policy-security-http/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/LICENSE
diff --git a/branches/sca-java-1.5/modules/policy-security-http/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/NOTICE
diff --git a/branches/sca-java-1.5/modules/policy-security-http/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/pom.xml
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicy.java
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/authentication/AuthenticationConfigurationPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicy.java
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/confidentiality/ConfidentialityPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationCallbackHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationCallbackHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationCallbackHandler.java
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationImplementationPolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationImplementationPolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationInterceptor.java
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicy.java
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationServicePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationServicePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationServicePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/util/HttpSecurityUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/util/HttpSecurityUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/util/HttpSecurityUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/util/HttpSecurityUtil.java
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/policy-security-http-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/policy-security-http-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-http/src/main/resources/policy-security-http-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-http/src/main/resources/policy-security-http-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/policy-security-jsr250/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-jsr250/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/LICENSE
diff --git a/branches/sca-java-1.5/modules/policy-security-jsr250/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-jsr250/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/NOTICE
diff --git a/branches/sca-java-1.5/modules/policy-security-jsr250/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-jsr250/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/pom.xml
diff --git a/branches/sca-java-1.5/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JSR250Activator.java
diff --git a/branches/sca-java-1.5/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JSR250PolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCaseFIXME.java
diff --git a/branches/sca-java-1.5/modules/policy-security/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/LICENSE
diff --git a/branches/sca-java-1.5/modules/policy-security/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/NOTICE
diff --git a/branches/sca-java-1.5/modules/policy-security/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/pom.xml
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/SecurityUtil.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationServicePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationServicePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationServicePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
diff --git a/branches/sca-java-1.5/modules/policy-security/src/main/resources/policy-security-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
diff --git a/branches/sca-java-1.5/modules/policy-transaction/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/LICENSE
diff --git a/branches/sca-java-1.5/modules/policy-transaction/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/NOTICE
diff --git a/branches/sca-java-1.5/modules/policy-transaction/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/pom.xml
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionReferencePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionServicePolicyProvider.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/log4j.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/resources/log4j.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/log4j.properties
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/tuscany_definitions.xml
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.5/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
diff --git a/branches/sca-java-1.5/modules/policy-xml-ws/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml-ws/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/LICENSE
diff --git a/branches/sca-java-1.5/modules/policy-xml-ws/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml-ws/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/NOTICE
diff --git a/branches/sca-java-1.5/modules/policy-xml-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml-ws/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/pom.xml
diff --git a/branches/sca-java-1.5/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.5/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-java-1.5/modules/policy-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/LICENSE
diff --git a/branches/sca-java-1.5/modules/policy-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/NOTICE
diff --git a/branches/sca-java-1.5/modules/policy-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/pom.xml
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-java-1.5/modules/policy/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/policy/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/LICENSE
diff --git a/branches/sca-java-1.5/modules/policy/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/policy/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/NOTICE
diff --git a/branches/sca-java-1.5/modules/policy/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/policy/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/pom.xml
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
diff --git a/branches/sca-java-1.5/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
diff --git a/branches/sca-java-1.5/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/branches/sca-java-1.5/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
diff --git a/branches/sca-java-1.5/modules/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/pom.xml
diff --git a/branches/sca-java-1.5/modules/sca-api-extension/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api-extension/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api-extension/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api-extension/LICENSE
diff --git a/branches/sca-java-1.5/modules/sca-api-extension/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api-extension/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api-extension/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api-extension/NOTICE
diff --git a/branches/sca-java-1.5/modules/sca-api-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api-extension/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api-extension/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api-extension/pom.xml
diff --git a/branches/sca-java-1.5/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api-extension/src/main/java/org/apache/tuscany/sca/api/ComponentContextExtension.java
diff --git a/branches/sca-java-1.5/modules/sca-api/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/LICENSE
diff --git a/branches/sca-java-1.5/modules/sca-api/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/NOTICE
diff --git a/branches/sca-java-1.5/modules/sca-api/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/pom.xml
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/Constants.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
diff --git a/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
similarity index 100%
rename from branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
diff --git a/branches/sca-java-1.5/modules/tracing-aspectj/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/tracing-aspectj/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/LICENSE
diff --git a/branches/sca-java-1.5/modules/tracing-aspectj/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/tracing-aspectj/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/NOTICE
diff --git a/branches/sca-java-1.5/modules/tracing-aspectj/launcher.bat b/sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/launcher.bat
similarity index 100%
rename from branches/sca-java-1.5/modules/tracing-aspectj/launcher.bat
rename to sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/launcher.bat
diff --git a/branches/sca-java-1.5/modules/tracing-aspectj/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/tracing-aspectj/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/pom.xml
diff --git a/branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java b/sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
similarity index 100%
rename from branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
diff --git a/branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java b/sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
similarity index 100%
rename from branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
diff --git a/branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java b/sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
similarity index 100%
rename from branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
diff --git a/branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java b/sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
similarity index 100%
rename from branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
diff --git a/branches/sca-java-1.5/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml b/sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
diff --git a/branches/sca-java-1.5/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
diff --git a/branches/sca-java-1.5/modules/web-javascript-dojo/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript-dojo/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/LICENSE
diff --git a/branches/sca-java-1.5/modules/web-javascript-dojo/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript-dojo/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/NOTICE
diff --git a/branches/sca-java-1.5/modules/web-javascript-dojo/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/build-dojo.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript-dojo/build-dojo.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/build-dojo.xml
diff --git a/branches/sca-java-1.5/modules/web-javascript-dojo/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript-dojo/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/pom.xml
diff --git a/branches/sca-java-1.5/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
diff --git a/branches/sca-java-1.5/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
diff --git a/branches/sca-java-1.5/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.5/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js
diff --git a/branches/sca-java-1.5/modules/web-javascript/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/LICENSE
diff --git a/branches/sca-java-1.5/modules/web-javascript/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/NOTICE
diff --git a/branches/sca-java-1.5/modules/web-javascript/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/pom.xml
diff --git a/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java
diff --git a/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java
diff --git a/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.5/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint
diff --git a/branches/sca-java-1.5/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint
diff --git a/branches/sca-java-1.5/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/workspace-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-impl/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/LICENSE
diff --git a/branches/sca-java-1.5/modules/workspace-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-impl/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/NOTICE
diff --git a/branches/sca-java-1.5/modules/workspace-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-impl/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/pom.xml
diff --git a/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
diff --git a/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
diff --git a/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
diff --git a/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
diff --git a/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
diff --git a/branches/sca-java-1.5/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
diff --git a/branches/sca-java-1.5/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
diff --git a/branches/sca-java-1.5/modules/workspace-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-xml/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/LICENSE
diff --git a/branches/sca-java-1.5/modules/workspace-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-xml/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/NOTICE
diff --git a/branches/sca-java-1.5/modules/workspace-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-xml/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/pom.xml
diff --git a/branches/sca-java-1.5/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
diff --git a/branches/sca-java-1.5/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
diff --git a/branches/sca-java-1.5/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/workspace/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/workspace/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace/LICENSE
diff --git a/branches/sca-java-1.5/modules/workspace/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/workspace/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace/NOTICE
diff --git a/branches/sca-java-1.5/modules/workspace/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/workspace/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace/pom.xml
diff --git a/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
diff --git a/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
diff --git a/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
diff --git a/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
diff --git a/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
diff --git a/branches/sca-java-1.5/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory b/sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
diff --git a/branches/sca-java-1.5/modules/xsd-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/LICENSE
diff --git a/branches/sca-java-1.5/modules/xsd-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/NOTICE
diff --git a/branches/sca-java-1.5/modules/xsd-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/pom.xml
diff --git a/branches/sca-java-1.5/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
diff --git a/branches/sca-java-1.5/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
diff --git a/branches/sca-java-1.5/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
diff --git a/branches/sca-java-1.5/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.5/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-1.5/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/main/resources/xsd-xml-validation-messages.properties
diff --git a/branches/sca-java-1.5/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
diff --git a/branches/sca-java-1.5/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
diff --git a/branches/sca-java-1.5/modules/xsd-xml/src/test/resources/xsd/greeting.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/test/resources/xsd/greeting.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/src/test/resources/xsd/greeting.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/test/resources/xsd/greeting.xsd
diff --git a/branches/sca-java-1.5/modules/xsd-xml/src/test/resources/xsd/name.xsd b/sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/test/resources/xsd/name.xsd
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd-xml/src/test/resources/xsd/name.xsd
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd-xml/src/test/resources/xsd/name.xsd
diff --git a/branches/sca-java-1.5/modules/xsd/LICENSE b/sca-java-1.x/branches/sca-java-1.5/modules/xsd/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd/LICENSE
diff --git a/branches/sca-java-1.5/modules/xsd/NOTICE b/sca-java-1.x/branches/sca-java-1.5/modules/xsd/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd/NOTICE
diff --git a/branches/sca-java-1.5/modules/xsd/pom.xml b/sca-java-1.x/branches/sca-java-1.5/modules/xsd/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd/pom.xml
diff --git a/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
diff --git a/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java b/sca-java-1.x/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
diff --git a/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java b/sca-java-1.x/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
diff --git a/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
diff --git a/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java b/sca-java-1.x/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
diff --git a/branches/sca-java-1.5/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory b/sca-java-1.x/branches/sca-java-1.5/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
similarity index 100%
rename from branches/sca-java-1.5/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
rename to sca-java-1.x/branches/sca-java-1.5/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
diff --git a/branches/sca-java-1.5/pom.xml b/sca-java-1.x/branches/sca-java-1.5/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/pom.xml
diff --git a/branches/sca-java-1.5/samples/README b/sca-java-1.x/branches/sca-java-1.5/samples/README
similarity index 100%
rename from branches/sca-java-1.5/samples/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/README
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/README b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/README
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/README
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/build.xml
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/pom.xml
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/Echo.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/Echo.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/Echo.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
diff --git a/branches/sca-java-1.5/samples/binding-echo-extension/src/test/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/test/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo-extension/src/test/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo-extension/src/test/resources/definitions.xml
diff --git a/branches/sca-java-1.5/samples/binding-echo/README b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/README
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/README
diff --git a/branches/sca-java-1.5/samples/binding-echo/binding-echo.png b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/binding-echo.png
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo/binding-echo.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/binding-echo.png
diff --git a/branches/sca-java-1.5/samples/binding-echo/binding-echo.svg b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/binding-echo.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo/binding-echo.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/binding-echo.svg
diff --git a/branches/sca-java-1.5/samples/binding-echo/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/build.xml
diff --git a/branches/sca-java-1.5/samples/binding-echo/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/pom.xml
diff --git a/branches/sca-java-1.5/samples/binding-echo/src/main/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/src/main/java/echo/Echo.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo/src/main/java/echo/Echo.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/src/main/java/echo/Echo.java
diff --git a/branches/sca-java-1.5/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
diff --git a/branches/sca-java-1.5/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/binding-echo/src/main/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/src/main/resources/EchoBinding.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo/src/main/resources/EchoBinding.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/src/main/resources/EchoBinding.composite
diff --git a/branches/sca-java-1.5/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-broker/README b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/README
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-broker/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/README
diff --git a/branches/sca-java-1.5/samples/binding-notification-broker/binding-notification-broker.png b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/binding-notification-broker.png
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-broker/binding-notification-broker.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/binding-notification-broker.png
diff --git a/branches/sca-java-1.5/samples/binding-notification-broker/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-broker/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/build.xml
diff --git a/branches/sca-java-1.5/samples/binding-notification-broker/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-broker/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/pom.xml
diff --git a/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.5/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.5/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-1.5/samples/binding-notification-consumer/README b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/README
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-consumer/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/README
diff --git a/branches/sca-java-1.5/samples/binding-notification-consumer/binding-notification-consumer.png b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/binding-notification-consumer.png
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-consumer/binding-notification-consumer.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/binding-notification-consumer.png
diff --git a/branches/sca-java-1.5/samples/binding-notification-consumer/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-consumer/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/build.xml
diff --git a/branches/sca-java-1.5/samples/binding-notification-consumer/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-consumer/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/pom.xml
diff --git a/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-1.5/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-producer/README b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/README
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-producer/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/README
diff --git a/branches/sca-java-1.5/samples/binding-notification-producer/binding-notification-producer.png b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/binding-notification-producer.png
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-producer/binding-notification-producer.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/binding-notification-producer.png
diff --git a/branches/sca-java-1.5/samples/binding-notification-producer/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-producer/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/build.xml
diff --git a/branches/sca-java-1.5/samples/binding-notification-producer/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-producer/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/pom.xml
diff --git a/branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
diff --git a/branches/sca-java-1.5/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.5/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.5/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
diff --git a/branches/sca-java-1.5/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/README b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/README
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/README
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/pom.xml
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/main/resources/CalculatorCORBAReference.composite
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAReferenceTestCase.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/CalculatorCORBAServant.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAService.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/java/calculator/idl/_CalculatorCORBAServiceImplBase.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-reference/src/test/resources/CalculatorCORBA.idl
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/README b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/README
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/README
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/pom.xml
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/main/resources/CalculatorCORBAServer.composite
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/CalculatorCORBAServerTestCase.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAService.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHelper.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceHolder.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/CalculatorCORBAServiceOperations.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/java/calculator/idl/_CalculatorCORBAServiceStub.java
diff --git a/branches/sca-java-1.5/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-corba-service/src/test/resources/CalculatorCORBA.idl
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/README b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/README
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/README
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/build.xml
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/calculator-distributed.png b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/calculator-distributed.png
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/calculator-distributed.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/calculator-distributed.png
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/calculator-distributed.svg b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/calculator-distributed.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/calculator-distributed.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/calculator-distributed.svg
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/cloud.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/cloud.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/cloud.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/cloud.composite
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/domain.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/domain.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/domain.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/domain.composite
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/pom.xml
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeA.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeB.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchCalculatorNodeC.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchDomain.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/java/node/LaunchDomain.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/cloud/NodeA.composite
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/cloud/NodeB.composite
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/cloud/NodeC.composite
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/src/test/java/calculator/CalculatorDistributedTestCase.java
diff --git a/branches/sca-java-1.5/samples/calculator-distributed/workspace.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/workspace.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-distributed/workspace.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-distributed/workspace.xml
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/README b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/README
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/README
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/build.xml
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/calculator.png b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/calculator.png
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/calculator.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/calculator.png
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/calculator.svg b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/calculator.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/calculator.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/calculator.svg
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/pom.xml
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/java/calculator/security/UserPrincipal.java
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/CalculatorJass.config
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/CalculatorLogMessages.properties
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-implementation-policies/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.5/samples/calculator-lean/README b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/README
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/README
diff --git a/branches/sca-java-1.5/samples/calculator-lean/calculator.png b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/calculator.png
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/calculator.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/calculator.png
diff --git a/branches/sca-java-1.5/samples/calculator-lean/calculator.svg b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/calculator.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/calculator.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/calculator.svg
diff --git a/branches/sca-java-1.5/samples/calculator-lean/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/pom.xml
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/main/resources/CalculatorTest.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/resources/CalculatorTest.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/main/resources/CalculatorTest.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/main/resources/CalculatorTest.composite
diff --git a/branches/sca-java-1.5/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/README b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/README
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/README
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/build.xml
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/calculator-rmi-reference.png b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/calculator-rmi-reference.png
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/calculator-rmi-reference.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/calculator-rmi-reference.png
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/calculator-rmi-reference.svg b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/calculator-rmi-reference.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/calculator-rmi-reference.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/calculator-rmi-reference.svg
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/pom.xml
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/README b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/README
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/README
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/build.xml
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/calculator-rmi-service.png b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/calculator-rmi-service.png
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/calculator-rmi-service.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/calculator-rmi-service.png
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/calculator-rmi-service.svg b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/calculator-rmi-service.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/calculator-rmi-service.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/calculator-rmi-service.svg
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/pom.xml
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServer.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/branches/sca-java-1.5/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-rmi-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/branches/sca-java-1.5/samples/calculator-script/README b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/README
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/README
diff --git a/branches/sca-java-1.5/samples/calculator-script/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/build.xml
diff --git a/branches/sca-java-1.5/samples/calculator-script/calculator-script.png b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/calculator-script.png
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/calculator-script.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/calculator-script.png
diff --git a/branches/sca-java-1.5/samples/calculator-script/calculator-script.svg b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/calculator-script.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/calculator-script.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/calculator-script.svg
diff --git a/branches/sca-java-1.5/samples/calculator-script/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/pom.xml
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/main/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-1.5/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-script/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/README
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/calculator-web.png
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/calculator-web.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/calculator-web.png
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/calculator-web.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/calculator-web.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/pom.xml
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/calc.jsp
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/calc.jsp
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/README
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/calculator-web.png
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/calculator-web.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/calculator-web.png
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/calculator-web.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/calculator-web.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/pom.xml
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/java/calculator/security/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/calculatorKeys.jks
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/security.properties b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/resources/security.properties
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-secure-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/README
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/calculator-web.png b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/calculator-web.png
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/calculator-web.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/calculator-web.png
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/calculator-web.svg b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/calculator-web.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/calculator-web.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/calculator-web.svg
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/pom.xml
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/calc.jsp b/sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator-ws-webapp/src/main/webapp/calc.jsp
diff --git a/branches/sca-java-1.5/samples/calculator/README b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/README
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/README
diff --git a/branches/sca-java-1.5/samples/calculator/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/build.xml
diff --git a/branches/sca-java-1.5/samples/calculator/calculator.png b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/calculator.png
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/calculator.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/calculator.png
diff --git a/branches/sca-java-1.5/samples/calculator/calculator.svg b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/calculator.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/calculator.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/calculator.svg
diff --git a/branches/sca-java-1.5/samples/calculator/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/pom.xml
diff --git a/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/main/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/main/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/main/java/calculator/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/main/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/main/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/main/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/main/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/main/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-java-1.5/samples/callback-ws-client/README b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/README
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-client/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/README
diff --git a/branches/sca-java-1.5/samples/callback-ws-client/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-client/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/build.xml
diff --git a/branches/sca-java-1.5/samples/callback-ws-client/callback-ws-client.png b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/callback-ws-client.png
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-client/callback-ws-client.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/callback-ws-client.png
diff --git a/branches/sca-java-1.5/samples/callback-ws-client/callback-ws-client.svg b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/callback-ws-client.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-client/callback-ws-client.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/callback-ws-client.svg
diff --git a/branches/sca-java-1.5/samples/callback-ws-client/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-client/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/pom.xml
diff --git a/branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myapp/MyClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myapp/MyClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myapp/MyClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myapp/MyClient.java
diff --git a/branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
diff --git a/branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myserver/MyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myserver/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myserver/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myserver/MyService.java
diff --git a/branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/main/java/myserver/MyServiceCallback.java
diff --git a/branches/sca-java-1.5/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/callback-ws-client/src/main/resources/myapp.composite b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/main/resources/myapp.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-client/src/main/resources/myapp.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/main/resources/myapp.composite
diff --git a/branches/sca-java-1.5/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
diff --git a/branches/sca-java-1.5/samples/callback-ws-service/README b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/README
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-service/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/README
diff --git a/branches/sca-java-1.5/samples/callback-ws-service/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-service/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/build.xml
diff --git a/branches/sca-java-1.5/samples/callback-ws-service/callback-ws-service.png b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/callback-ws-service.png
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-service/callback-ws-service.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/callback-ws-service.png
diff --git a/branches/sca-java-1.5/samples/callback-ws-service/callback-ws-service.svg b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/callback-ws-service.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-service/callback-ws-service.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/callback-ws-service.svg
diff --git a/branches/sca-java-1.5/samples/callback-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-service/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/pom.xml
diff --git a/branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
diff --git a/branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/MyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/MyService.java
diff --git a/branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/MyServiceCallback.java
diff --git a/branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/main/java/myserver/MyServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/callback-ws-service/src/main/resources/callbackws.composite b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/main/resources/callbackws.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-service/src/main/resources/callbackws.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/main/resources/callbackws.composite
diff --git a/branches/sca-java-1.5/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/README b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/README
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/README
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/build.xml
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/pom.xml
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/CallbackJMSClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/CallbackJMSClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/CallbackJMSClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/CallbackJMSClient.java
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderCallback.java
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderRequest.java
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderResponse.java
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderService.java b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderService.java
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderServiceClient.java
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/java/callbacks/OrderServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/src/main/resources/callbacks.composite b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/resources/callbacks.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/src/main/resources/callbacks.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/resources/callbacks.composite
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/resources/jndi.properties
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/src/main/resources/jndi.properties
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/callbacks-jms/src/test/java/callbacks/CallbacksTestCase.java
diff --git a/branches/sca-java-1.5/samples/chat-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/samples/chat-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/README
diff --git a/branches/sca-java-1.5/samples/chat-webapp/chat-webapp.png b/sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/chat-webapp.png
similarity index 100%
rename from branches/sca-java-1.5/samples/chat-webapp/chat-webapp.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/chat-webapp.png
diff --git a/branches/sca-java-1.5/samples/chat-webapp/chat-webapp.svg b/sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/chat-webapp.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/chat-webapp/chat-webapp.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/chat-webapp.svg
diff --git a/branches/sca-java-1.5/samples/chat-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/chat-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/pom.xml
diff --git a/branches/sca-java-1.5/samples/chat-webapp/src/main/java/sample/ChatService.java b/sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/java/sample/ChatService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/chat-webapp/src/main/java/sample/ChatService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/java/sample/ChatService.java
diff --git a/branches/sca-java-1.5/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/chat-webapp/src/main/resources/chat.composite b/sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/resources/chat.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/chat-webapp/src/main/resources/chat.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/resources/chat.composite
diff --git a/branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/chat.html b/sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/chat.html
similarity index 100%
rename from branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/chat.html
rename to sca-java-1.x/branches/sca-java-1.5/samples/chat-webapp/src/main/webapp/chat.html
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/README
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/build-dojo.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/build-dojo.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/build-dojo.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/build.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.png
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/customer-dojo-jsonrpc.svg
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/customer.sql b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/customer.sql
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/customer.sql
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/customer.sql
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/pom.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/Customer.java
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollection.java
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerService.java
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/customer/CustomerServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/launch/Launch.java b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/java/launch/Launch.java
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/orm.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/persistence.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/customer.composite b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/customer.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/customer.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/resources/customer.composite
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/customer.jsp b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo-webapp/src/main/webapp/customer.jsp
diff --git a/branches/sca-java-1.5/samples/customer-dojo/README b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/README
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/README
diff --git a/branches/sca-java-1.5/samples/customer-dojo/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/build-dojo.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/build-dojo.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/build-dojo.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/build.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo/customer-dojo-jsonrpc.png b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/customer-dojo-jsonrpc.png
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/customer-dojo-jsonrpc.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/customer-dojo-jsonrpc.png
diff --git a/branches/sca-java-1.5/samples/customer-dojo/customer-dojo-jsonrpc.svg b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/customer-dojo-jsonrpc.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/customer-dojo-jsonrpc.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/customer-dojo-jsonrpc.svg
diff --git a/branches/sca-java-1.5/samples/customer-dojo/customer.sql b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/customer.sql
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/customer.sql
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/customer.sql
diff --git a/branches/sca-java-1.5/samples/customer-dojo/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/pom.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/Customer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/Customer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/Customer.java
diff --git a/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerCollection.java b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerCollection.java
diff --git a/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerCollectionImpl.java
diff --git a/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerService.java b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerService.java
diff --git a/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/java/customer/CustomerServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/customer-dojo/src/main/java/launch/Launch.java b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/java/launch/Launch.java
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/src/main/java/launch/Launch.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/java/launch/Launch.java
diff --git a/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/META-INF/orm.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/META-INF/orm.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/src/main/resources/META-INF/orm.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/META-INF/orm.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/META-INF/persistence.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/META-INF/persistence.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/content/customer.html b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/content/customer.html
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/src/main/resources/content/customer.html
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/content/customer.html
diff --git a/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/customer.composite b/sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/customer.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/customer-dojo/src/main/resources/customer.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/customer-dojo/src/main/resources/customer.composite
diff --git a/branches/sca-java-1.5/samples/databinding-echo/README b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/README
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/README
diff --git a/branches/sca-java-1.5/samples/databinding-echo/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/build.xml
diff --git a/branches/sca-java-1.5/samples/databinding-echo/databinding-echo.png b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/databinding-echo.png
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/databinding-echo.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/databinding-echo.png
diff --git a/branches/sca-java-1.5/samples/databinding-echo/databinding-echo.svg b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/databinding-echo.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/databinding-echo.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/databinding-echo.svg
diff --git a/branches/sca-java-1.5/samples/databinding-echo/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/pom.xml
diff --git a/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
diff --git a/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
diff --git a/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/Echo.java b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/Echo.java
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/Echo.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/Echo.java
diff --git a/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
diff --git a/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/Interface1.java
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/Interface1.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/Interface1.java
diff --git a/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/Interface2.java
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/Interface2.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/java/dbecho/Interface2.java
diff --git a/branches/sca-java-1.5/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
diff --git a/branches/sca-java-1.5/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
diff --git a/branches/sca-java-1.5/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
diff --git a/branches/sca-java-1.5/samples/domain-management/README b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/README
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/README
diff --git a/branches/sca-java-1.5/samples/domain-management/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/pom.xml
diff --git a/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
diff --git a/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/DistributeComponents.java b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/DistributeComponents.java
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/main/java/manager/DistributeComponents.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/DistributeComponents.java
diff --git a/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/ListComponents.java b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/ListComponents.java
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/main/java/manager/ListComponents.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/ListComponents.java
diff --git a/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/ListDependencies.java b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/ListDependencies.java
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/main/java/manager/ListDependencies.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/ListDependencies.java
diff --git a/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/ListDeployables.java b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/ListDeployables.java
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/main/java/manager/ListDeployables.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/ListDeployables.java
diff --git a/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/WireComponents.java b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/WireComponents.java
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/main/java/manager/WireComponents.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/main/java/manager/WireComponents.java
diff --git a/branches/sca-java-1.5/samples/domain-management/src/test/java/services/Cart.java b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/java/services/Cart.java
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/test/java/services/Cart.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/java/services/Cart.java
diff --git a/branches/sca-java-1.5/samples/domain-management/src/test/java/services/Item.java b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/java/services/Item.java
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/test/java/services/Item.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/java/services/Item.java
diff --git a/branches/sca-java-1.5/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
diff --git a/branches/sca-java-1.5/samples/domain-management/src/test/java/services/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.5/samples/domain-management/src/test/resources/assembly/assets.xml b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/assembly/assets.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/test/resources/assembly/assets.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/assembly/assets.xml
diff --git a/branches/sca-java-1.5/samples/domain-management/src/test/resources/assembly/client.xml b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/assembly/client.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/test/resources/assembly/client.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/assembly/client.xml
diff --git a/branches/sca-java-1.5/samples/domain-management/src/test/resources/assembly/store.xml b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/assembly/store.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/test/resources/assembly/store.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/assembly/store.xml
diff --git a/branches/sca-java-1.5/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/assets/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/client/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/domain-management/src/test/resources/client/client.composite b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/client/client.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/test/resources/client/client.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/client/client.composite
diff --git a/branches/sca-java-1.5/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/store/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/domain-management/src/test/resources/store/store.composite b/sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/store/store.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/domain-management/src/test/resources/store/store.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/domain-management/src/test/resources/store/store.composite
diff --git a/branches/sca-java-1.5/samples/feed-aggregator-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/README
diff --git a/branches/sca-java-1.5/samples/feed-aggregator-webapp/feed-aggregator-webapp.png b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/feed-aggregator-webapp.png
diff --git a/branches/sca-java-1.5/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/feed-aggregator-webapp.svg
diff --git a/branches/sca-java-1.5/samples/feed-aggregator-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/pom.xml
diff --git a/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java
diff --git a/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/java/feed/Sort.java
diff --git a/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/java/feed/SortImpl.java
diff --git a/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/resources/FeedAggregator.composite
diff --git a/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/index.html b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/index.html
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/index.html
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator-webapp/src/main/webapp/index.html
diff --git a/branches/sca-java-1.5/samples/feed-aggregator/README b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/README
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/README
diff --git a/branches/sca-java-1.5/samples/feed-aggregator/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/build.xml
diff --git a/branches/sca-java-1.5/samples/feed-aggregator/feed-aggregator.png b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/feed-aggregator.png
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator/feed-aggregator.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/feed-aggregator.png
diff --git a/branches/sca-java-1.5/samples/feed-aggregator/feed-aggregator.svg b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/feed-aggregator.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator/feed-aggregator.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/feed-aggregator.svg
diff --git a/branches/sca-java-1.5/samples/feed-aggregator/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/pom.xml
diff --git a/branches/sca-java-1.5/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java
diff --git a/branches/sca-java-1.5/samples/feed-aggregator/src/main/java/feed/Sort.java b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/src/main/java/feed/Sort.java
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator/src/main/java/feed/Sort.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/src/main/java/feed/Sort.java
diff --git a/branches/sca-java-1.5/samples/feed-aggregator/src/main/java/feed/SortImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/src/main/java/feed/SortImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator/src/main/java/feed/SortImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/src/main/java/feed/SortImpl.java
diff --git a/branches/sca-java-1.5/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/src/main/java/launch/LaunchFeedServer.java
diff --git a/branches/sca-java-1.5/samples/feed-aggregator/src/main/resources/FeedAggregator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/src/main/resources/FeedAggregator.composite
diff --git a/branches/sca-java-1.5/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/feed-aggregator/src/test/java/feed/FeedAggregatorTestCase.java
diff --git a/branches/sca-java-1.5/samples/helloworld-bpel/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-bpel/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/README
diff --git a/branches/sca-java-1.5/samples/helloworld-bpel/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-bpel/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-bpel/helloworld-bpel.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/helloworld-bpel.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-bpel/helloworld-bpel.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/branches/sca-java-1.5/samples/helloworld-bpel/helloworld-bpel.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/helloworld-bpel.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-bpel/helloworld-bpel.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-bpel/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-bpel/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/src/main/java/helloworld/BPELClient.java
diff --git a/branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/helloworld.bpel
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/helloworld.bpel
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/log4j.properties
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/log4j.properties
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/branches/sca-java-1.5/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-bpel/src/test/java/helloworld/BPELHelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/README
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/build-dojo.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/build-dojo.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/build-dojo.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/style.css
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/style.css
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/style.css
diff --git a/branches/sca-java-1.5/samples/helloworld-jms-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jms-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/README
diff --git a/branches/sca-java-1.5/samples/helloworld-jms-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jms-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/META-INF/context.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/META-INF/sca-deployables/HelloWorld.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jms-webapp/src/main/webapp/hello.jsp
diff --git a/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/README
diff --git a/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.png
diff --git a/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/resources/jsonrpc.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/HelloWorldJSONRPC.html
diff --git a/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-jsonrpc-webapp/src/main/webapp/style.css
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/README
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/helloworld-reference.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/helloworld-reference.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/helloworld-reference.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/helloworld-reference.png
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/helloworld-reference.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/helloworld-reference.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/helloworld-reference.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/helloworld-reference.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/helloworldjmsreference.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/logging.properties
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/logging.properties
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/branches/sca-java-1.5/samples/helloworld-service-jms/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-service-jms/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/README
diff --git a/branches/sca-java-1.5/samples/helloworld-service-jms/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-service-jms/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-service-jms/helloworld-service.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/helloworld-service.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-service-jms/helloworld-service.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/helloworld-service.png
diff --git a/branches/sca-java-1.5/samples/helloworld-service-jms/helloworld-service.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/helloworld-service.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-service-jms/helloworld-service.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/helloworld-service.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-service-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-service-jms/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-service-jms/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCaseOff.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/README
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/helloworld-ws-reference.png
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/helloworld-ws-reference.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjms.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/helloworldwsjmsclient.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-jms/src/test/java/helloworld/HelloWorldJmsClientTestCase.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/README
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/README
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.png
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/helloworld-ws-reference-secure.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/ClientPWCBHandler.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference-secure/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/README
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/helloworld-ws-reference.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/helloworld-ws-reference.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/helloworld-ws-reference.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/helloworld-ws-reference.png
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/helloworld-ws-reference.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/helloworld-ws-reference.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/helloworld-ws-reference.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/helloworld-ws-reference.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/resources/logging.properties
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/resources/logging.properties
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-reference/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/README
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/README
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/logging.properties
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/logging.properties
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/README
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/helloworld-ws-service.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/helloworld-ws-service.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/helloworld-ws-service.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/helloworld-ws-service.png
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/helloworld-ws-service.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/helloworld-ws-service.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjmspolicy.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsPolicyServerTestCase.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/README
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.png
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/helloworld-ws-service-secure.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-secure/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/README
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-webapp/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/README
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/README
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/build.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service/helloworld-ws-service.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/helloworld-ws-service.png
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service/helloworld-ws-service.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/helloworld-ws-service.png
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service/helloworld-ws-service.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/helloworld-ws-service.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service/helloworld-ws-service.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/helloworld-ws-service.svg
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/pom.xml
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-java-1.5/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/README b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/README
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/README
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/build.xml
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/pom.xml
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Order.java
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/Status.java
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/java/org/example/orderservice/package-info.java
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/META-INF/sca-deployables/orderws.composite
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl
diff --git a/branches/sca-java-1.5/samples/holder-ws-service/src/test/java/org/example/orderservice/OrderServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/test/java/org/example/orderservice/OrderServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/holder-ws-service/src/test/java/org/example/orderservice/OrderServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/holder-ws-service/src/test/java/org/example/orderservice/OrderServiceTestCase.java
diff --git a/branches/sca-java-1.5/samples/implementation-composite/README b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/README
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/README
diff --git a/branches/sca-java-1.5/samples/implementation-composite/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/build.xml
diff --git a/branches/sca-java-1.5/samples/implementation-composite/implementation-composite.png b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/implementation-composite.png
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/implementation-composite.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/implementation-composite.png
diff --git a/branches/sca-java-1.5/samples/implementation-composite/implementation-composite.svg b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/implementation-composite.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/implementation-composite.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/implementation-composite.svg
diff --git a/branches/sca-java-1.5/samples/implementation-composite/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/pom.xml
diff --git a/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/CompositeClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/CompositeClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/Source.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/Source.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/Source.java
diff --git a/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/SourceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/SourceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/SourceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/SourceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/Target.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/Target.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/Target.java
diff --git a/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/TargetImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/TargetImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-java-1.5/samples/implementation-composite/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/resources/InnerComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/src/main/resources/InnerComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-java-1.5/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/resources/InnerComposite2.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/src/main/resources/InnerComposite2.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-java-1.5/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/implementation-composite/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/resources/OuterComposite.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/src/main/resources/OuterComposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-java-1.5/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/README b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/README
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/README
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/build.xml
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/pom.xml
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
diff --git a/branches/sca-java-1.5/samples/implementation-crud-extension/src/test/resources/crud.composite b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/test/resources/crud.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud-extension/src/test/resources/crud.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud-extension/src/test/resources/crud.composite
diff --git a/branches/sca-java-1.5/samples/implementation-crud/README b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/README
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/README
diff --git a/branches/sca-java-1.5/samples/implementation-crud/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/build.xml
diff --git a/branches/sca-java-1.5/samples/implementation-crud/implementation-crud.png b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/implementation-crud.png
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud/implementation-crud.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/implementation-crud.png
diff --git a/branches/sca-java-1.5/samples/implementation-crud/implementation-crud.svg b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/implementation-crud.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud/implementation-crud.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/implementation-crud.svg
diff --git a/branches/sca-java-1.5/samples/implementation-crud/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/pom.xml
diff --git a/branches/sca-java-1.5/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
diff --git a/branches/sca-java-1.5/samples/implementation-crud/src/main/resources/crud.composite b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/src/main/resources/crud.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud/src/main/resources/crud.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/src/main/resources/crud.composite
diff --git a/branches/sca-java-1.5/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
diff --git a/branches/sca-java-1.5/samples/implementation-notification/README b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/README
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/README
diff --git a/branches/sca-java-1.5/samples/implementation-notification/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/build.xml
diff --git a/branches/sca-java-1.5/samples/implementation-notification/implementation-notification.png b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/implementation-notification.png
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/implementation-notification.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/implementation-notification.png
diff --git a/branches/sca-java-1.5/samples/implementation-notification/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/pom.xml
diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
diff --git a/branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/README b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/README
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/README
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/build.xml
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/pom.xml
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
diff --git a/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-java-1.5/samples/loanapplication/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/loanapplication/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/pom.xml
diff --git a/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java b/sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
similarity index 100%
rename from branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanApplication.java
diff --git a/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
diff --git a/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanClient.java
diff --git a/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
diff --git a/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanService.java b/sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanService.java
diff --git a/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/loanapplication/src/main/resources/loanapplication.composite b/sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/resources/loanapplication.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/loanapplication/src/main/resources/loanapplication.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/main/resources/loanapplication.composite
diff --git a/branches/sca-java-1.5/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/README b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/README
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/README
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/build-bundles.xml b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/build-bundles.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/build-bundles.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/build-bundles.xml
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/build.xml
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/osgi-supplychain.png b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/osgi-supplychain.png
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/osgi-supplychain.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/osgi-supplychain.png
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/osgi-supplychain.svg b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/osgi-supplychain.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/osgi-supplychain.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/osgi-supplychain.svg
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/pom.xml
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Customer.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Customer.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Customer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Customer.componentType
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSCustomer.componentType
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSRetailer.componentType
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSShipper.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSShipper.componentType
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/DSWarehouse.componentType
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Retailer.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Retailer.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Retailer.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Retailer.componentType
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Shipper.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Shipper.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Shipper.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Shipper.componentType
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Warehouse.componentType b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/Warehouse.componentType
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.mf
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Customer.xml
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.mf
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Retailer.xml
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.mf
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Shipper.xml
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.mf
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/osgi/ds/Warehouse.xml
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/supplychain.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/supplychain.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite
diff --git a/branches/sca-java-1.5/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/osgi-supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-java-1.5/samples/photo-gallery/README b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/README
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/README
diff --git a/branches/sca-java-1.5/samples/photo-gallery/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/build.xml
diff --git a/branches/sca-java-1.5/samples/photo-gallery/photo-gallery.png b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/photo-gallery.png
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/photo-gallery.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/photo-gallery.png
diff --git a/branches/sca-java-1.5/samples/photo-gallery/photo-gallery.svg b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/photo-gallery.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/photo-gallery.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/photo-gallery.svg
diff --git a/branches/sca-java-1.5/samples/photo-gallery/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/pom.xml
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/java/launch/LaunchGallery.java b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/java/services/Album.java b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/java/services/Album.java
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/java/services/Album.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/java/services/Album.java
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/java/services/AlbumImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/java/services/AlbumImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/java/services/AlbumImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/java/services/AlbumImpl.java
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery.html b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery.html
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery.html
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery.html
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00368.jpg
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00369.jpg
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00370.jpg
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00371.jpg
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00373.jpg
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00375.jpg
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00376.jpg
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00377.jpg
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00378.jpg
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00379.jpg
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/gallery/boston/dsc00380.jpg
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/index.gif b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/index.gif
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/index.gif
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/index.gif
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/index_on.gif b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/index_on.gif
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/index_on.gif
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/index_on.gif
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/next.gif b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/next.gif
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/next.gif
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/next.gif
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/next_disabled.gif b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/next_disabled.gif
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/next_disabled.gif
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/next_disabled.gif
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/next_on.gif b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/next_on.gif
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/next_on.gif
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/next_on.gif
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/photo-gallery.composite b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/photo-gallery.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/photo-gallery.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/photo-gallery.composite
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/prev.gif b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/prev.gif
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/prev.gif
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/prev.gif
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/prev_disabled.gif b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/prev_disabled.gif
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/prev_disabled.gif
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/prev_disabled.gif
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/prev_on.gif b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/prev_on.gif
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/prev_on.gif
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/prev_on.gif
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/show_slide.gif b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/show_slide.gif
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/show_slide.gif
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/show_slide.gif
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/space.gif b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/space.gif
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/space.gif
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/space.gif
diff --git a/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/styles.css b/sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/styles.css
similarity index 100%
rename from branches/sca-java-1.5/samples/photo-gallery/src/main/resources/styles.css
rename to sca-java-1.x/branches/sca-java-1.5/samples/photo-gallery/src/main/resources/styles.css
diff --git a/branches/sca-java-1.5/samples/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/pom.xml
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/README b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/README
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/README
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/build-dojo.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/build-dojo.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/build-dojo.xml
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/build.xml
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/pom.xml
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/simple-bigbank-spring.png b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/simple-bigbank-spring.png
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/simple-bigbank-spring.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/simple-bigbank-spring.png
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/simple-bigbank-spring.svg b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/simple-bigbank-spring.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/simple-bigbank-spring.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/simple-bigbank-spring.svg
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/feed/AccountFeedImpl.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountDetails.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountService.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/savings/SavingsAccountServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountDetails.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountService.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/account/stock/StockAccountServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/SavingsAccount.composite
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/StockAccount.composite
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/Account-spring-context.xml
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/SavingsAccount-context.xml
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/spring-context/StockAccount/META-INF/spring/StockAccount-context.xml
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/web/style.css b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/web/style.css
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/web/style.css
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/main/resources/web/style.css
diff --git a/branches/sca-java-1.5/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank-spring/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/README b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/README
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/README
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/build.xml
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/pom.xml
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/simple-bigbank.png b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/simple-bigbank.png
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/simple-bigbank.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/simple-bigbank.png
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/simple-bigbank.svg b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/simple-bigbank.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/simple-bigbank.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/simple-bigbank.svg
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/resources/Account.composite b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/resources/Account.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/resources/Account.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/resources/Account.composite
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/resources/BigBank.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/resources/BigBank.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/main/resources/StockQuote.composite b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/resources/StockQuote.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/main/resources/StockQuote.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/main/resources/StockQuote.composite
diff --git a/branches/sca-java-1.5/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/README b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/README
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/README
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/build.xml
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/pom.xml
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/simple-callback-ws.png b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/simple-callback-ws.png
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/simple-callback-ws.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/simple-callback-ws.png
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/simple-callback-ws.svg b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/simple-callback-ws.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/simple-callback-ws.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/simple-callback-ws.svg
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/resources/simplecallback.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/src/main/resources/simplecallback.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/resources/simplecallback.composite
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
diff --git a/branches/sca-java-1.5/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-java-1.5/samples/simple-callback/README b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/README
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/README
diff --git a/branches/sca-java-1.5/samples/simple-callback/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/build.xml
diff --git a/branches/sca-java-1.5/samples/simple-callback/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/pom.xml
diff --git a/branches/sca-java-1.5/samples/simple-callback/simple-callback.png b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/simple-callback.png
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/simple-callback.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/simple-callback.png
diff --git a/branches/sca-java-1.5/samples/simple-callback/simple-callback.svg b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/simple-callback.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/simple-callback.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/simple-callback.svg
diff --git a/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-java-1.5/samples/simple-callback/src/main/resources/simplecallback.composite b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/resources/simplecallback.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/src/main/resources/simplecallback.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/main/resources/simplecallback.composite
diff --git a/branches/sca-java-1.5/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/README b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/README
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/README
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/build.xml
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/pom.xml
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/AddService.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/META-INF/spring/CalculatorService-context.xml
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/AddServiceImpl.js
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/DivideServiceImpl.groovy
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/MultiplyServiceImpl.py
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/main/resources/calculator/SubtractServiceImpl.rb
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-calculator/src/test/java/bigbank/calculator/CalculatorServiceTestCase.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/README b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/README
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/README
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/build.xml
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/pom.xml
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountDetails.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountService.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/CheckingAccountServiceImpl.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/AccountsDataPasswordCallbackHandler.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/BigbankCheckingsAcl.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthImplementationPolicyProvider.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicy.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyInterceptor.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthPolicyProviderFactory.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyHandler.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/security/CheckingsDeptAuthorizationPolicyProcessor.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/CheckingsAccount.composite
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/main/resources/spring-context/META-INF/spring/CheckingAccountService-context.xml
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-checkaccount/src/test/java/bigbank/checkaccount/CheckAccountServiceTestCase.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-stockquote/README b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/README
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-stockquote/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/README
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-stockquote/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-stockquote/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/build.xml
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-stockquote/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-stockquote/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/pom.xml
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/SCAApplicationContextProvider.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/resources/META-INF/spring/StockQuoteService-context.xml
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
diff --git a/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/spring-bigbank-stockquote/src/test/java/bigbank/stockquote/StockQuoteServiceTestCase.java
diff --git a/branches/sca-java-1.5/samples/store-dojo/README b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/README
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/README
diff --git a/branches/sca-java-1.5/samples/store-dojo/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/pom.xml
diff --git a/branches/sca-java-1.5/samples/store-dojo/src/main/java/launch/Launch.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/launch/Launch.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/src/main/java/launch/Launch.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/launch/Launch.java
diff --git a/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Cart.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Cart.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Cart.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Cart.java
diff --git a/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Catalog.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Catalog.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Catalog.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Catalog.java
diff --git a/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/CurrencyConverter.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/CurrencyConverter.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/src/main/java/services/CurrencyConverter.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/CurrencyConverter.java
diff --git a/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/CurrencyConverterImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/CurrencyConverterImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/src/main/java/services/CurrencyConverterImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/CurrencyConverterImpl.java
diff --git a/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/FruitsCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/FruitsCatalogImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/src/main/java/services/FruitsCatalogImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/FruitsCatalogImpl.java
diff --git a/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Item.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Item.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Item.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Item.java
diff --git a/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/ShoppingCartImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/src/main/java/services/ShoppingCartImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Total.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Total.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Total.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/java/services/Total.java
diff --git a/branches/sca-java-1.5/samples/store-dojo/src/main/resources/store.composite b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/resources/store.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/src/main/resources/store.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/resources/store.composite
diff --git a/branches/sca-java-1.5/samples/store-dojo/src/main/resources/uiservices/store.html b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/resources/uiservices/store.html
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/src/main/resources/uiservices/store.html
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/src/main/resources/uiservices/store.html
diff --git a/branches/sca-java-1.5/samples/store-dojo/store.png b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/store.png
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/store.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/store.png
diff --git a/branches/sca-java-1.5/samples/store-dojo/store.svg b/sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/store.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/store-dojo/store.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-dojo/store.svg
diff --git a/branches/sca-java-1.5/samples/store-secure/README b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/README
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/README
diff --git a/branches/sca-java-1.5/samples/store-secure/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/pom.xml
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/java/launch/Launch.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/launch/Launch.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/java/launch/Launch.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/launch/Launch.java
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/java/launch/LaunchProtected.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/launch/LaunchProtected.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/java/launch/LaunchProtected.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/launch/LaunchProtected.java
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/java/launch/LaunchSSL.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/launch/LaunchSSL.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/java/launch/LaunchSSL.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/launch/LaunchSSL.java
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/java/services/Cart.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/Cart.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/java/services/Cart.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/Cart.java
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/java/services/Catalog.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/Catalog.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/java/services/Catalog.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/Catalog.java
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/java/services/CurrencyConverter.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/CurrencyConverter.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/java/services/CurrencyConverter.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/CurrencyConverter.java
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/java/services/CurrencyConverterImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/CurrencyConverterImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/java/services/CurrencyConverterImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/CurrencyConverterImpl.java
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/java/services/FruitsCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/FruitsCatalogImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/java/services/FruitsCatalogImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/FruitsCatalogImpl.java
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/java/services/Item.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/Item.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/java/services/Item.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/Item.java
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/java/services/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/ShoppingCartImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/java/services/ShoppingCartImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/java/services/Total.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/Total.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/java/services/Total.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/java/services/Total.java
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/resources/store-protected.composite b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/resources/store-protected.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/resources/store-protected.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/resources/store-protected.composite
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/resources/store-ssl.composite b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/resources/store-ssl.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/resources/store-ssl.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/resources/store-ssl.composite
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/resources/store.composite b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/resources/store.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/resources/store.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/resources/store.composite
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/resources/tuscany.keyStore b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/resources/tuscany.keyStore
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/resources/tuscany.keyStore
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/resources/tuscany.keyStore
diff --git a/branches/sca-java-1.5/samples/store-secure/src/main/resources/uiservices/store.html b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/resources/uiservices/store.html
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/src/main/resources/uiservices/store.html
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/src/main/resources/uiservices/store.html
diff --git a/branches/sca-java-1.5/samples/store-secure/store.png b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/store.png
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/store.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/store.png
diff --git a/branches/sca-java-1.5/samples/store-secure/store.svg b/sca-java-1.x/branches/sca-java-1.5/samples/store-secure/store.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/store-secure/store.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-secure/store.svg
diff --git a/branches/sca-java-1.5/samples/store-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/README
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/README
diff --git a/branches/sca-java-1.5/samples/store-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/pom.xml
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Cart.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Cart.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Cart.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Cart.java
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Catalog.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Catalog.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Catalog.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Catalog.java
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/CurrencyConverter.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/CurrencyConverter.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/java/services/CurrencyConverter.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/CurrencyConverter.java
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/CurrencyConverterImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/CurrencyConverterImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/java/services/CurrencyConverterImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/CurrencyConverterImpl.java
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Item.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Item.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Item.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Item.java
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Total.java b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Total.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Total.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/java/services/Total.java
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/resources/store.composite b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/resources/store.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/resources/store.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/resources/store.composite
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/store.html b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/store.html
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/src/main/webapp/store.html
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/src/main/webapp/store.html
diff --git a/branches/sca-java-1.5/samples/store-webapp/store.png b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/store.png
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/store.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/store.png
diff --git a/branches/sca-java-1.5/samples/store-webapp/store.svg b/sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/store.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/store-webapp/store.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/store-webapp/store.svg
diff --git a/branches/sca-java-1.5/samples/store/README b/sca-java-1.x/branches/sca-java-1.5/samples/store/README
similarity index 100%
rename from branches/sca-java-1.5/samples/store/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/README
diff --git a/branches/sca-java-1.5/samples/store/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/store/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/store/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/build.xml
diff --git a/branches/sca-java-1.5/samples/store/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/store/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/store/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/pom.xml
diff --git a/branches/sca-java-1.5/samples/store/src/main/java/launch/Launch.java b/sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/launch/Launch.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store/src/main/java/launch/Launch.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/launch/Launch.java
diff --git a/branches/sca-java-1.5/samples/store/src/main/java/services/Cart.java b/sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/Cart.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store/src/main/java/services/Cart.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/Cart.java
diff --git a/branches/sca-java-1.5/samples/store/src/main/java/services/Catalog.java b/sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/Catalog.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store/src/main/java/services/Catalog.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/Catalog.java
diff --git a/branches/sca-java-1.5/samples/store/src/main/java/services/CurrencyConverter.java b/sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/CurrencyConverter.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store/src/main/java/services/CurrencyConverter.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/CurrencyConverter.java
diff --git a/branches/sca-java-1.5/samples/store/src/main/java/services/CurrencyConverterImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/CurrencyConverterImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store/src/main/java/services/CurrencyConverterImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/CurrencyConverterImpl.java
diff --git a/branches/sca-java-1.5/samples/store/src/main/java/services/FruitsCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/FruitsCatalogImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store/src/main/java/services/FruitsCatalogImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/FruitsCatalogImpl.java
diff --git a/branches/sca-java-1.5/samples/store/src/main/java/services/Item.java b/sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/Item.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store/src/main/java/services/Item.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/Item.java
diff --git a/branches/sca-java-1.5/samples/store/src/main/java/services/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/ShoppingCartImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store/src/main/java/services/ShoppingCartImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.5/samples/store/src/main/java/services/Total.java b/sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/Total.java
similarity index 100%
rename from branches/sca-java-1.5/samples/store/src/main/java/services/Total.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/java/services/Total.java
diff --git a/branches/sca-java-1.5/samples/store/src/main/resources/store.composite b/sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/resources/store.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/store/src/main/resources/store.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/resources/store.composite
diff --git a/branches/sca-java-1.5/samples/store/src/main/resources/uiservices/store.html b/sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/resources/uiservices/store.html
similarity index 100%
rename from branches/sca-java-1.5/samples/store/src/main/resources/uiservices/store.html
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/src/main/resources/uiservices/store.html
diff --git a/branches/sca-java-1.5/samples/store/store.png b/sca-java-1.x/branches/sca-java-1.5/samples/store/store.png
similarity index 100%
rename from branches/sca-java-1.5/samples/store/store.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/store.png
diff --git a/branches/sca-java-1.5/samples/store/store.svg b/sca-java-1.x/branches/sca-java-1.5/samples/store/store.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/store/store.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/store/store.svg
diff --git a/branches/sca-java-1.5/samples/supplychain/README b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/README
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/README
diff --git a/branches/sca-java-1.5/samples/supplychain/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/build.xml
diff --git a/branches/sca-java-1.5/samples/supplychain/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/pom.xml
diff --git a/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Customer.java b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Customer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Customer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Customer.java
diff --git a/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Retailer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Retailer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Shipper.java
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Shipper.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Warehouse.java
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Warehouse.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/branches/sca-java-1.5/samples/supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/resources/supplychain.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/src/main/resources/supplychain.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-java-1.5/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-java-1.5/samples/supplychain/supplychain.png b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/supplychain.png
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/supplychain.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/supplychain.png
diff --git a/branches/sca-java-1.5/samples/supplychain/supplychain.svg b/sca-java-1.x/branches/sca-java-1.5/samples/supplychain/supplychain.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/supplychain/supplychain.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/supplychain/supplychain.svg
diff --git a/branches/sca-java-1.5/samples/web-resource/README b/sca-java-1.x/branches/sca-java-1.5/samples/web-resource/README
similarity index 100%
rename from branches/sca-java-1.5/samples/web-resource/README
rename to sca-java-1.x/branches/sca-java-1.5/samples/web-resource/README
diff --git a/branches/sca-java-1.5/samples/web-resource/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/web-resource/build.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/web-resource/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/web-resource/build.xml
diff --git a/branches/sca-java-1.5/samples/web-resource/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/web-resource/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/samples/web-resource/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/samples/web-resource/pom.xml
diff --git a/branches/sca-java-1.5/samples/web-resource/src/main/java/web/resource/SampleServer.java b/sca-java-1.x/branches/sca-java-1.5/samples/web-resource/src/main/java/web/resource/SampleServer.java
similarity index 100%
rename from branches/sca-java-1.5/samples/web-resource/src/main/java/web/resource/SampleServer.java
rename to sca-java-1.x/branches/sca-java-1.5/samples/web-resource/src/main/java/web/resource/SampleServer.java
diff --git a/branches/sca-java-1.5/samples/web-resource/src/main/resources/WebResource.composite b/sca-java-1.x/branches/sca-java-1.5/samples/web-resource/src/main/resources/WebResource.composite
similarity index 100%
rename from branches/sca-java-1.5/samples/web-resource/src/main/resources/WebResource.composite
rename to sca-java-1.x/branches/sca-java-1.5/samples/web-resource/src/main/resources/WebResource.composite
diff --git a/branches/sca-java-1.5/samples/web-resource/src/main/resources/myContent/index.html b/sca-java-1.x/branches/sca-java-1.5/samples/web-resource/src/main/resources/myContent/index.html
similarity index 100%
rename from branches/sca-java-1.5/samples/web-resource/src/main/resources/myContent/index.html
rename to sca-java-1.x/branches/sca-java-1.5/samples/web-resource/src/main/resources/myContent/index.html
diff --git a/branches/sca-java-1.5/samples/web-resource/web-resource.png b/sca-java-1.x/branches/sca-java-1.5/samples/web-resource/web-resource.png
similarity index 100%
rename from branches/sca-java-1.5/samples/web-resource/web-resource.png
rename to sca-java-1.x/branches/sca-java-1.5/samples/web-resource/web-resource.png
diff --git a/branches/sca-java-1.5/samples/web-resource/web-resource.svg b/sca-java-1.x/branches/sca-java-1.5/samples/web-resource/web-resource.svg
similarity index 100%
rename from branches/sca-java-1.5/samples/web-resource/web-resource.svg
rename to sca-java-1.x/branches/sca-java-1.5/samples/web-resource/web-resource.svg
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/LICENSE
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/NOTICE
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/build.xml b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/build.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/build.xml
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/pom.xml
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/main/java/org/apache/tuscany/tools/contrib2wsdl/Contrib2WSDL.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/main/java/org/apache/tuscany/tools/contrib2wsdl/Contrib2WSDL.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/main/java/org/apache/tuscany/tools/contrib2wsdl/Contrib2WSDL.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/main/java/org/apache/tuscany/tools/contrib2wsdl/Contrib2WSDL.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/AddService.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/AddService.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/AddServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/AddServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/CalculatorClient.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/CalculatorClient.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/CalculatorService.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/CalculatorService.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/CalculatorServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/CalculatorServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/DivideService.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/DivideService.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/DivideServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/DivideServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/MultiplyService.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/MultiplyService.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/MultiplyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/MultiplyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/SubtractService.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/SubtractService.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/SubtractServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/SubtractServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/org/apache/tuscany/tools/contrib2wsdl/Contrib2WSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/org/apache/tuscany/tools/contrib2wsdl/Contrib2WSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/org/apache/tuscany/tools/contrib2wsdl/Contrib2WSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/java/org/apache/tuscany/tools/contrib2wsdl/Contrib2WSDLTestCase.java
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/resources/Calculator.composite
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/resources/Calculator.composite
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/tools/contrib2wsdl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/contrib2wsdl/src/test/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/contrib2wsdl/src/test/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tools/eclipse/features/core/.project b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/.project
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/features/core/.project
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/.project
diff --git a/branches/sca-java-1.5/tools/eclipse/features/core/LICENSE b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/features/core/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/LICENSE
diff --git a/branches/sca-java-1.5/tools/eclipse/features/core/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/META-INF/MANIFEST.MF
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/features/core/META-INF/MANIFEST.MF
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.5/tools/eclipse/features/core/NOTICE b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/features/core/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/NOTICE
diff --git a/branches/sca-java-1.5/tools/eclipse/features/core/build.properties b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/build.properties
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/features/core/build.properties
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/build.properties
diff --git a/branches/sca-java-1.5/tools/eclipse/features/core/feature.xml b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/feature.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/features/core/feature.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/feature.xml
diff --git a/branches/sca-java-1.5/tools/eclipse/features/core/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/features/core/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/features/core/pom.xml
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/.project b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/.project
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/.project
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/.project
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/LICENSE b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/LICENSE
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/NOTICE b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/NOTICE
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/build.properties b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/build.properties
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/build.properties
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/build.properties
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/exsd/runtimeLibraries.exsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/exsd/runtimeLibraries.exsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/exsd/runtimeLibraries.exsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/exsd/runtimeLibraries.exsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/icons/t.gif b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/icons/t.gif
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/icons/t.gif
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/icons/t.gif
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/icons/tuscany.gif b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/icons/tuscany.gif
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/icons/tuscany.gif
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/icons/tuscany.gif
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/ClasspathUtil.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainer.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyClasspathContainerInitializer.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyLibraryEntryPage.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyRuntimeClasspathContainer.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyRuntimeClasspathContainer.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyRuntimeClasspathContainer.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/classpath/TuscanyRuntimeClasspathContainer.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/DomainManagerLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/DomainManagerLauncherUtil.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/DomainManagerLauncherUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/DomainManagerLauncherUtil.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/NodeLauncherUtil.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/NodeLauncherUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationDelegate.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchConfigurationTabGroup.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchDomainManagerAction.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchDomainManagerAction.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchDomainManagerAction.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchDomainManagerAction.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeFilter.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeFilter.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeFilter.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeFilter.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeShortcut.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeShortcut.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeShortcut.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/launch/TuscanyLaunchNodeShortcut.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/log/LogUtil.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/log/LogUtil.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/log/LogUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/log/LogUtil.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizard.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewComponentTypeWizardPage.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizard.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/newwizards/NewCompositeWizardPage.java
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/plugin.xml b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/plugin.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/plugin.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/plugin.xml
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/pom.xml
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-all.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-all.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-all.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-all.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-contribution.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-core.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-core.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-core.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-core.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-definitions.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-policy.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-policy.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-policy.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca-policy.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/sca.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
diff --git a/branches/sca-java-1.5/tools/eclipse/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/pom.xml
diff --git a/branches/sca-java-1.5/tools/eclipse/site/updatesite/.project b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/site/updatesite/.project
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/site/updatesite/.project
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/site/updatesite/.project
diff --git a/branches/sca-java-1.5/tools/eclipse/site/updatesite/LICENSE b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/site/updatesite/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/site/updatesite/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/site/updatesite/LICENSE
diff --git a/branches/sca-java-1.5/tools/eclipse/site/updatesite/NOTICE b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/site/updatesite/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/site/updatesite/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/site/updatesite/NOTICE
diff --git a/branches/sca-java-1.5/tools/eclipse/site/updatesite/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/site/updatesite/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/site/updatesite/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/site/updatesite/pom.xml
diff --git a/branches/sca-java-1.5/tools/eclipse/site/updatesite/site.xml b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/site/updatesite/site.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/site/updatesite/site.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/site/updatesite/site.xml
diff --git a/branches/sca-java-1.5/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/sca-java-1.x/branches/sca-java-1.5/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
diff --git a/branches/sca-java-1.5/tools/java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/LICENSE
diff --git a/branches/sca-java-1.5/tools/java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/NOTICE
diff --git a/branches/sca-java-1.5/tools/java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/pom.xml
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/GenerationParameters.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDL.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGenerator.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorFactory.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/Java2WSDLGeneratorImpl.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2OMBuilder.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLBuilder.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLConstants.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyTypeTable.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyWSDLTypesGenerator.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenListener.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/util/XMLNameUtil.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerValue.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/CustomerWithAccount.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/ExampleService.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/account/Account.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/customer/Customer.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/extra/GoldCustomer.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/AccountService.wsdl
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/resources/AccountService.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/resources/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/interopdoc.wsdl
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/resources/interopdoc.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/sequences.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/sequences.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/java2wsdl/src/test/resources/sequences.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/java2wsdl/src/test/resources/sequences.xsd
diff --git a/branches/sca-java-1.5/tools/maven/maven-ant-generator/LICENSE b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-ant-generator/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-ant-generator/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-ant-generator/LICENSE
diff --git a/branches/sca-java-1.5/tools/maven/maven-ant-generator/NOTICE b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-ant-generator/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-ant-generator/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-ant-generator/NOTICE
diff --git a/branches/sca-java-1.5/tools/maven/maven-ant-generator/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-ant-generator/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-ant-generator/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-ant-generator/pom.xml
diff --git a/branches/sca-java-1.5/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
diff --git a/branches/sca-java-1.5/tools/maven/maven-dependency-lister/LICENSE b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-dependency-lister/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-dependency-lister/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-dependency-lister/LICENSE
diff --git a/branches/sca-java-1.5/tools/maven/maven-dependency-lister/NOTICE b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-dependency-lister/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-dependency-lister/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-dependency-lister/NOTICE
diff --git a/branches/sca-java-1.5/tools/maven/maven-dependency-lister/README b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-dependency-lister/README
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-dependency-lister/README
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-dependency-lister/README
diff --git a/branches/sca-java-1.5/tools/maven/maven-dependency-lister/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-dependency-lister/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-dependency-lister/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-dependency-lister/pom.xml
diff --git a/branches/sca-java-1.5/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-dependency-lister/src/main/java/org/apache/tuscany/tools/sca/dependency/lister/plugin/DependencyListerMojo.java
diff --git a/branches/sca-java-1.5/tools/maven/maven-incremental-build/LICENSE b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-incremental-build/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-incremental-build/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-incremental-build/LICENSE
diff --git a/branches/sca-java-1.5/tools/maven/maven-incremental-build/NOTICE b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-incremental-build/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-incremental-build/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-incremental-build/NOTICE
diff --git a/branches/sca-java-1.5/tools/maven/maven-incremental-build/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-incremental-build/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-incremental-build/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-incremental-build/pom.xml
diff --git a/branches/sca-java-1.5/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
diff --git a/branches/sca-java-1.5/tools/maven/maven-java2wsdl/LICENSE b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-java2wsdl/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-java2wsdl/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-java2wsdl/LICENSE
diff --git a/branches/sca-java-1.5/tools/maven/maven-java2wsdl/NOTICE b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-java2wsdl/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-java2wsdl/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-java2wsdl/NOTICE
diff --git a/branches/sca-java-1.5/tools/maven/maven-java2wsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-java2wsdl/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-java2wsdl/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-java2wsdl/pom.xml
diff --git a/branches/sca-java-1.5/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/plugin/Java2WSDLGeneratorMojo.java
diff --git a/branches/sca-java-1.5/tools/maven/maven-osgi-junit/LICENSE b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-osgi-junit/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-osgi-junit/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-osgi-junit/LICENSE
diff --git a/branches/sca-java-1.5/tools/maven/maven-osgi-junit/NOTICE b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-osgi-junit/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-osgi-junit/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-osgi-junit/NOTICE
diff --git a/branches/sca-java-1.5/tools/maven/maven-osgi-junit/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-osgi-junit/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-osgi-junit/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-osgi-junit/pom.xml
diff --git a/branches/sca-java-1.5/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/tools/sca/osgi/junit/plugin/OSGiJUnitMojo.java b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/tools/sca/osgi/junit/plugin/OSGiJUnitMojo.java
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/tools/sca/osgi/junit/plugin/OSGiJUnitMojo.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-osgi-junit/src/main/java/org/apache/tuscany/tools/sca/osgi/junit/plugin/OSGiJUnitMojo.java
diff --git a/branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/pom.xml
diff --git a/branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java
diff --git a/branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java
diff --git a/branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/TuscanyBundlePluginMojo.java
diff --git a/branches/sca-java-1.5/tools/maven/maven-wsdl2java/LICENSE b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-wsdl2java/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-wsdl2java/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-wsdl2java/LICENSE
diff --git a/branches/sca-java-1.5/tools/maven/maven-wsdl2java/NOTICE b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-wsdl2java/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-wsdl2java/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-wsdl2java/NOTICE
diff --git a/branches/sca-java-1.5/tools/maven/maven-wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-wsdl2java/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-wsdl2java/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-wsdl2java/pom.xml
diff --git a/branches/sca-java-1.5/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDL2JavaGeneratorMojo.java
diff --git a/branches/sca-java-1.5/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java b/sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/maven-wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/plugin/WSDLFileOption.java
diff --git a/branches/sca-java-1.5/tools/maven/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/maven/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/maven/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/maven/pom.xml
diff --git a/branches/sca-java-1.5/tools/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/pom.xml
diff --git a/branches/sca-java-1.5/tools/wsdl2java/LICENSE b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/LICENSE
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/LICENSE
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/LICENSE
diff --git a/branches/sca-java-1.5/tools/wsdl2java/NOTICE b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/NOTICE
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/NOTICE
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/NOTICE
diff --git a/branches/sca-java-1.5/tools/wsdl2java/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/pom.xml
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/RemotableInterfaceWritter.java
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingTypeMappingEntry.java
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/util/XMLNameUtil.java
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/main/resources/RemotableInterfaceTemplate.xsl
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGeneratorTestCase.java
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/java/org/soapinterop/CreditScoreDocLit.java
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/AccountService.wsdl
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/test/resources/AccountService.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/AccountServiceWithFault.wsdl
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/CreditScoreDocLit.wsdl
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/helloworld.wsdl
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/test/resources/helloworld.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/helloworld.wsdl
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/interopdoc.wsdl b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/interopdoc.wsdl
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/test/resources/interopdoc.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/interopdoc.wsdl
diff --git a/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/sequences.xsd b/sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/sequences.xsd
similarity index 100%
rename from branches/sca-java-1.5/tools/wsdl2java/src/test/resources/sequences.xsd
rename to sca-java-1.x/branches/sca-java-1.5/tools/wsdl2java/src/test/resources/sequences.xsd
diff --git a/branches/sca-java-1.5/tutorials/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/README b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/README
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/README
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/README
diff --git a/branches/sca-java-1.5/tutorials/store/Tutorial.pdf b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/Tutorial.pdf
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/Tutorial.pdf
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/Tutorial.pdf
diff --git a/branches/sca-java-1.5/tutorials/store/assets/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/assets/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/Cart.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/Cart.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/Cart.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/Cart.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/Catalog.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/Catalog.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/Catalog.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/Catalog.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/CurrencyConverter.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/CurrencyConverter.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/CurrencyConverter.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/CurrencyConverter.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/CurrencyConverterImpl.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/CurrencyConverterImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/CurrencyConverterImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/CurrencyConverterImpl.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/FruitsCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/FruitsCatalogImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/FruitsCatalogImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/FruitsCatalogImpl.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/Item.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/Item.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/Item.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/Item.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/ShoppingCartImpl.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/ShoppingCartImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/ShoppingCartImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/ShoppingCartImpl.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/Total.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/Total.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/Total.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/Total.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/VegetablesCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/VegetablesCatalogImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/VegetablesCatalogImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/VegetablesCatalogImpl.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/db/ShoppingCartTableImpl.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/db/ShoppingCartTableImpl.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/db/cart.sql b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/db/cart.sql
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/db/cart.sql
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/db/cart.sql
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/map/FruitsCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/map/FruitsCatalogImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/map/FruitsCatalogImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/map/FruitsCatalogImpl.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/market/MarketCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/market/MarketCatalogImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/market/MarketCatalogImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/market/MarketCatalogImpl.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/services/merger/MergedCatalogImpl.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/merger/MergedCatalogImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/services/merger/MergedCatalogImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/services/merger/MergedCatalogImpl.java
diff --git a/branches/sca-java-1.5/tutorials/store/assets/tutorial.html b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/tutorial.html
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/tutorial.html
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/tutorial.html
diff --git a/branches/sca-java-1.5/tutorials/store/assets/uiservices/store.html b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/uiservices/store.html
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/assets/uiservices/store.html
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/assets/uiservices/store.html
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBHome.java
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/CatalogEJBRemote.java
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/Vegetable.java
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/java/services/ejb/VegetablesCatalogEJBSessionBean.java
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/VegetablesCatalogEJB.componentType
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/main/resources/catalog-ejb.composite
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-mediation/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-mediation/catalog-mediation.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-mediation/catalog-mediation.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-mediation/catalog-mediation.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-mediation/catalog-mediation.composite
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-mediation/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-mediation/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-mediation/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-mediation/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-mediation/services/mediation/VegetablesCatalogMediationImpl.java
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-webapp/catalog-web.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-webapp/catalog-web.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-webapp/catalog-web.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-webapp/catalog-web.composite
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-webapp/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-webapp/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-webapp/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/catalog.jsp b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/catalog.jsp
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/catalog.jsp
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/catalog-webapp/webapp/catalog.jsp
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogEJBNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogEJBNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogEJBNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogEJBNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogMediationNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogMediationNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogMediationNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogMediationNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogWebAppNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogWebAppNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogWebAppNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogWebAppNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogsNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogsNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogsNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/CatalogsNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/CurrencyNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/CurrencyNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/CurrencyNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/CurrencyNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreClientNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreClientNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/StoreClientNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreClientNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreDBNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreDBNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/StoreDBNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreDBNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreEUNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreEUNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/StoreEUNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreEUNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreMarketNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreMarketNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/StoreMarketNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreMarketNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreMashupNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreMashupNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/StoreMashupNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreMashupNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreMergerNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreMergerNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/StoreMergerNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreMergerNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/StoreNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreSupplierNode.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreSupplierNode.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/cloud/StoreSupplierNode.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/cloud/StoreSupplierNode.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/domain.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/domain.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/domain.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/domain.composite
diff --git a/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchCatalogMediationNode.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchCatalogMediationNode.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/launch/LaunchCatalogMediationNode.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchCatalogMediationNode.java
diff --git a/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchCatalogsNode.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchCatalogsNode.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/launch/LaunchCatalogsNode.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchCatalogsNode.java
diff --git a/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchCurrencyNode.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchCurrencyNode.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/launch/LaunchCurrencyNode.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchCurrencyNode.java
diff --git a/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreDBNode.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreDBNode.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreDBNode.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreDBNode.java
diff --git a/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreEUNode.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreEUNode.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreEUNode.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreEUNode.java
diff --git a/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreMarketNode.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreMarketNode.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreMarketNode.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreMarketNode.java
diff --git a/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreMashupNode.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreMashupNode.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreMashupNode.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreMashupNode.java
diff --git a/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreMergerNode.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreMergerNode.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreMergerNode.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreMergerNode.java
diff --git a/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreNode.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreNode.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreNode.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreNode.java
diff --git a/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreSupplierNode.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreSupplierNode.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreSupplierNode.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchStoreSupplierNode.java
diff --git a/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchTutorialDomainManager.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchTutorialDomainManager.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/launch/LaunchTutorialDomainManager.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/launch/LaunchTutorialDomainManager.java
diff --git a/branches/sca-java-1.5/tutorials/store/domain/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/domain/workspace.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/workspace.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/domain/workspace.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/domain/workspace.xml
diff --git a/branches/sca-java-1.5/tutorials/store/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-client/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-client/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-client/client/Shopper.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/client/Shopper.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-client/client/Shopper.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/client/Shopper.java
diff --git a/branches/sca-java-1.5/tutorials/store/store-client/client/ShopperImpl.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/client/ShopperImpl.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-client/client/ShopperImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/client/ShopperImpl.java
diff --git a/branches/sca-java-1.5/tutorials/store/store-client/launch/LaunchStoreClientNode.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/launch/LaunchStoreClientNode.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-client/launch/LaunchStoreClientNode.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/launch/LaunchStoreClientNode.java
diff --git a/branches/sca-java-1.5/tutorials/store/store-client/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-client/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-client/services/Cart.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/services/Cart.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-client/services/Cart.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/services/Cart.java
diff --git a/branches/sca-java-1.5/tutorials/store/store-client/services/Catalog.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/services/Catalog.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-client/services/Catalog.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/services/Catalog.java
diff --git a/branches/sca-java-1.5/tutorials/store/store-client/services/Item.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/services/Item.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-client/services/Item.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/services/Item.java
diff --git a/branches/sca-java-1.5/tutorials/store/store-client/services/Total.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/services/Total.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-client/services/Total.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/services/Total.java
diff --git a/branches/sca-java-1.5/tutorials/store/store-client/store-client.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/store-client.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-client/store-client.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-client/store-client.composite
diff --git a/branches/sca-java-1.5/tutorials/store/store-db/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-db/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-db/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-db/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-db/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-db/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-db/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-db/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-db/store-db.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-db/store-db.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-db/store-db.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-db/store-db.composite
diff --git a/branches/sca-java-1.5/tutorials/store/store-eu/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-eu/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-eu/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-eu/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-eu/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-eu/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-eu/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-eu/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-eu/store-eu.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-eu/store-eu.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-eu/store-eu.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-eu/store-eu.composite
diff --git a/branches/sca-java-1.5/tutorials/store/store-eu/uiservices/store-eu.html b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-eu/uiservices/store-eu.html
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-eu/uiservices/store-eu.html
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-eu/uiservices/store-eu.html
diff --git a/branches/sca-java-1.5/tutorials/store/store-market/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-market/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-market/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-market/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-market/build.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-market/build.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-market/build.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-market/build.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-market/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-market/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-market/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-market/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-market/store-market.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-market/store-market.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-market/store-market.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-market/store-market.composite
diff --git a/branches/sca-java-1.5/tutorials/store/store-mashup/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-mashup/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-mashup/build-openajax.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/build-openajax.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-mashup/build-openajax.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/build-openajax.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-mashup/gadget/map-gadget.html b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/gadget/map-gadget.html
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-mashup/gadget/map-gadget.html
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/gadget/map-gadget.html
diff --git a/branches/sca-java-1.5/tutorials/store/store-mashup/gadget/store-gadget.html b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/gadget/store-gadget.html
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-mashup/gadget/store-gadget.html
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/gadget/store-gadget.html
diff --git a/branches/sca-java-1.5/tutorials/store/store-mashup/map-gadget.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/map-gadget.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-mashup/map-gadget.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/map-gadget.composite
diff --git a/branches/sca-java-1.5/tutorials/store/store-mashup/mashup/store-mash.html b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/mashup/store-mash.html
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-mashup/mashup/store-mash.html
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/mashup/store-mash.html
diff --git a/branches/sca-java-1.5/tutorials/store/store-mashup/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-mashup/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-mashup/store-gadget.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/store-gadget.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-mashup/store-gadget.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/store-gadget.composite
diff --git a/branches/sca-java-1.5/tutorials/store/store-mashup/store-mashup.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/store-mashup.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-mashup/store-mashup.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-mashup/store-mashup.composite
diff --git a/branches/sca-java-1.5/tutorials/store/store-merger/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-merger/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-merger/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-merger/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-merger/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-merger/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-merger/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-merger/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-merger/store-merger.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-merger/store-merger.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-merger/store-merger.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-merger/store-merger.composite
diff --git a/branches/sca-java-1.5/tutorials/store/store-supplier/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-supplier/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-supplier/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-supplier/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-supplier/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-supplier/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-supplier/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-supplier/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-supplier/store-supplier.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-supplier/store-supplier.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-supplier/store-supplier.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-supplier/store-supplier.composite
diff --git a/branches/sca-java-1.5/tutorials/store/store-test/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-test/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-test/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-test/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-test/client/Shopper.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-test/client/Shopper.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-test/client/Shopper.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-test/client/Shopper.java
diff --git a/branches/sca-java-1.5/tutorials/store/store-test/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-test/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-test/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-test/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store-test/test/StoreSupplierTestCase.java b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-test/test/StoreSupplierTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store-test/test/StoreSupplierTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store-test/test/StoreSupplierTestCase.java
diff --git a/branches/sca-java-1.5/tutorials/store/store/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store/pom.xml
diff --git a/branches/sca-java-1.5/tutorials/store/store/store.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/store/store.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/store/store.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/store/store.composite
diff --git a/branches/sca-java-1.5/tutorials/store/web-services/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/web-services/META-INF/sca-contribution.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/web-services/META-INF/sca-contribution.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/web-services/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5/tutorials/store/web-services/catalogs.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/web-services/catalogs.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/web-services/catalogs.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/web-services/catalogs.composite
diff --git a/branches/sca-java-1.5/tutorials/store/web-services/currency.composite b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/web-services/currency.composite
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/web-services/currency.composite
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/web-services/currency.composite
diff --git a/branches/sca-java-1.5/tutorials/store/web-services/pom.xml b/sca-java-1.x/branches/sca-java-1.5/tutorials/store/web-services/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/tutorials/store/web-services/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/tutorials/store/web-services/pom.xml
diff --git a/branches/sca-java-1.5/vtest/assembly/component/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/pom.xml
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/DService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EEService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/EService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/FService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/HService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClient.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyClientImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceCallBack.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/callback/MyServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientA.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientAImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientB.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientBImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientC.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientCImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientD.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientDImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientE.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyClientEImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/reference/MyServiceImpl2.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/binding_resolution.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/binding_resolution.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/binding_resolution.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/binding_resolution.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/callback_bindings.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/callback_bindings.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/callback_bindings.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/callback_bindings.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_duplicate_property.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_1.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_1.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_1.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_1.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_2.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_2.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_2.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_2.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_3.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_3.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_3.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/component_property_3.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniquename.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniquename.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniquename.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniquename.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomponenttype.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/nonuniqueservicenameincomposite.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notcompatibleinterface.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notmatchofservicename.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/notmatchofservicename.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/ABServiceImpl.componentType
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/DServiceImpl.componentType
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/EServiceImpl.componentType
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/org/apache/tuscany/sca/vtest/assembly/component/impl/FServiceImpl.componentType
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_1.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_1.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_1.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_1.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_2.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_2.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_2.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_2.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_3.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_3.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_3.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_3.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_4.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_4.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_4.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/referencename_4.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/serviceelement.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/serviceelement.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/serviceelement.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/serviceelement.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithbinding.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithbinding.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithbinding.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithbinding.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithinterface.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithinterface.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithinterface.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/servicewithinterface.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zerocomponents.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zerocomponents.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zerocomponents.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zerocomponents.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zeroimplelements.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zeroimplelements.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zeroimplelements.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/main/resources/zeroimplelements.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java
diff --git a/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/pom.xml
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/AService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/BService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServer.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/EService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/EServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/composite.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/composite.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/composite.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/composite.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositeb.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositeb.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositeb.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositeb.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositec.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositec.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositec.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositec.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositecopy.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositecopy.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositecopy.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/compositecopy.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentinterface_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentlocalwire.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/dservicews.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/dservicews.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/dservicews.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/dservicews.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/localcomponent.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/localcomponent.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/localcomponent.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/localcomponent.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_inner.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_outer.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/reference_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_inner.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_outer.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/service_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subinterfacewire.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subinterfacewire.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subinterfacewire.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subinterfacewire.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/wire.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/wire.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/wire.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/main/resources/wire.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/pom.xml
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/typefile.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/typefile.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/typefile.composite
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
diff --git a/branches/sca-java-1.5/vtest/assembly/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/assembly/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/assembly/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/assembly/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversational/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversational/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/oneway/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/oneway/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/resources/property.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/resources/property.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/resources/property.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/main/resources/property.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/reference/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/reference/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/resources/ab.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/resources/ab.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/resources/ab.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/main/resources/ab.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/resources/scope.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/resources/scope.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/resources/scope.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/main/resources/scope.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/resources/service.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/resources/service.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/resources/service.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/main/resources/service.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/callablereference/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/callablereference/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/componentcontext/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/conversation/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/conversation/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/resources/conversation.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/resources/exception.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/resources/exception.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/resources/exception.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/main/resources/exception.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/requestcontext/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/servicereference/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/servicereference/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/main/resources/callback.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/main/resources/callback-mixed.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/callbackmixed/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
diff --git a/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/conversation/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/conversation/pom.xml
diff --git a/branches/sca-java-1.5/vtest/java-api/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/java-api/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/java-api/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/java-api/pom.xml
diff --git a/branches/sca-java-1.5/vtest/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/pom.xml
diff --git a/branches/sca-java-1.5/vtest/processcomments.rb b/sca-java-1.x/branches/sca-java-1.5/vtest/processcomments.rb
similarity index 100%
rename from branches/sca-java-1.5/vtest/processcomments.rb
rename to sca-java-1.x/branches/sca-java-1.5/vtest/processcomments.rb
diff --git a/branches/sca-java-1.5/vtest/utilities/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/utilities/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/utilities/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/utilities/pom.xml
diff --git a/branches/sca-java-1.5/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java b/sca-java-1.x/branches/sca-java-1.5/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/pom.xml
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/pom.xml
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/pom.xml
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/pom.xml
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/pom.xml
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/aservice.wsdl b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/aservice.wsdl
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/aservice.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/aservice.wsdl
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/endpointreference.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/endpointreference.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/endpointreference.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/endpointreference.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlport.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlport.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlport.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlport.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlservice.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/pom.xml
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/pom.xml
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/pom.xml
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/pom.xml b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/pom.xml
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/pom.xml
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/pom.xml
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
diff --git a/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java
similarity index 100%
rename from branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java
rename to sca-java-1.x/branches/sca-java-1.5/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java