summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/trunk/modules/workspace
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-13 01:42:27 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-13 01:42:27 +0000
commit3c7c4a749baafcf375f4785a7668d3a25c9063e3 (patch)
treea66b8b031c5dc6c7744f44b44b6bcd371bd0b8df /sca-java-1.x/trunk/modules/workspace
parenteb03ff672236cddf65533f39b83ddd5e2984a2bb (diff)
Moving 1.x trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835700 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/trunk/modules/workspace-impl/LICENSE (renamed from branches/sca-java-1.x/modules/workspace-impl/LICENSE)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-impl/NOTICE (renamed from branches/sca-java-1.x/modules/workspace-impl/NOTICE)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-impl/pom.xml (renamed from branches/sca-java-1.x/modules/workspace-impl/pom.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java (renamed from branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java (renamed from branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java (renamed from branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java (renamed from branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java (renamed from branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor (renamed from branches/sca-java-1.x/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties (renamed from branches/sca-java-1.x/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties (renamed from branches/sca-java-1.x/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java (renamed from branches/sca-java-1.x/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-manager/LICENSE (renamed from branches/sca-java-1.x/modules/workspace-manager/LICENSE)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-manager/NOTICE (renamed from branches/sca-java-1.x/modules/workspace-manager/NOTICE)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-manager/pom.xml (renamed from branches/sca-java-1.x/modules/workspace-manager/pom.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java (renamed from branches/sca-java-1.x/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java (renamed from branches/sca-java-1.x/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-xml/LICENSE (renamed from branches/sca-java-1.x/modules/workspace-xml/LICENSE)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-xml/NOTICE (renamed from branches/sca-java-1.x/modules/workspace-xml/NOTICE)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-xml/pom.xml (renamed from branches/sca-java-1.x/modules/workspace-xml/pom.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java (renamed from branches/sca-java-1.x/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java (renamed from branches/sca-java-1.x/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.x/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties (renamed from branches/sca-java-1.x/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java (renamed from branches/sca-java-1.x/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace/LICENSE (renamed from branches/sca-java-1.x/modules/workspace/LICENSE)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace/NOTICE (renamed from branches/sca-java-1.x/modules/workspace/NOTICE)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace/pom.xml (renamed from branches/sca-java-1.x/modules/workspace/pom.xml)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/ContributionConfiguration.java (renamed from branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/ContributionConfiguration.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java (renamed from branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java (renamed from branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java (renamed from branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java (renamed from branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java (renamed from branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java (renamed from branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java)0
-rw-r--r--sca-java-1.x/trunk/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory (renamed from branches/sca-java-1.x/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory)0
36 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.x/modules/workspace-impl/LICENSE b/sca-java-1.x/trunk/modules/workspace-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/LICENSE
+++ b/sca-java-1.x/trunk/modules/workspace-impl/LICENSE
diff --git a/branches/sca-java-1.x/modules/workspace-impl/NOTICE b/sca-java-1.x/trunk/modules/workspace-impl/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/NOTICE
+++ b/sca-java-1.x/trunk/modules/workspace-impl/NOTICE
diff --git a/branches/sca-java-1.x/modules/workspace-impl/pom.xml b/sca-java-1.x/trunk/modules/workspace-impl/pom.xml
index d08880e88c..d08880e88c 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/pom.xml
+++ b/sca-java-1.x/trunk/modules/workspace-impl/pom.xml
diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java b/sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
index ebfc77f5e3..ebfc77f5e3 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
+++ b/sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java
diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java b/sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
index 4aa619aa3f..4aa619aa3f 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
+++ b/sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java
diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java b/sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
index d7a05ff532..d7a05ff532 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
+++ b/sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java
diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java b/sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
index 45ba8c0609..45ba8c0609 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
+++ b/sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java
diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java b/sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
index 9dd1b3a15b..9dd1b3a15b 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
+++ b/sca-java-1.x/trunk/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java
diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/trunk/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 41d0ebe27d..41d0ebe27d 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/trunk/modules/workspace-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties b/sca-java-1.x/trunk/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
index 0c07a3a30f..0c07a3a30f 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
+++ b/sca-java-1.x/trunk/modules/workspace-impl/src/main/resources/workspace-validation-messages.properties
diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties b/sca-java-1.x/trunk/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
index 2e8326c062..2e8326c062 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
+++ b/sca-java-1.x/trunk/modules/workspace-impl/src/main/resources/workspace-validation-messages_it.properties
diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java b/sca-java-1.x/trunk/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
index f7b6b35679..f7b6b35679 100644
--- a/branches/sca-java-1.x/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
+++ b/sca-java-1.x/trunk/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java
diff --git a/branches/sca-java-1.x/modules/workspace-manager/LICENSE b/sca-java-1.x/trunk/modules/workspace-manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.x/modules/workspace-manager/LICENSE
+++ b/sca-java-1.x/trunk/modules/workspace-manager/LICENSE
diff --git a/branches/sca-java-1.x/modules/workspace-manager/NOTICE b/sca-java-1.x/trunk/modules/workspace-manager/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-1.x/modules/workspace-manager/NOTICE
+++ b/sca-java-1.x/trunk/modules/workspace-manager/NOTICE
diff --git a/branches/sca-java-1.x/modules/workspace-manager/pom.xml b/sca-java-1.x/trunk/modules/workspace-manager/pom.xml
index e42066ee3b..e42066ee3b 100644
--- a/branches/sca-java-1.x/modules/workspace-manager/pom.xml
+++ b/sca-java-1.x/trunk/modules/workspace-manager/pom.xml
diff --git a/branches/sca-java-1.x/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java b/sca-java-1.x/trunk/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java
index 0ea82f8e86..0ea82f8e86 100644
--- a/branches/sca-java-1.x/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java
+++ b/sca-java-1.x/trunk/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java
diff --git a/branches/sca-java-1.x/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java b/sca-java-1.x/trunk/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java
index f95f74ab2c..f95f74ab2c 100644
--- a/branches/sca-java-1.x/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java
+++ b/sca-java-1.x/trunk/modules/workspace-manager/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java
diff --git a/branches/sca-java-1.x/modules/workspace-xml/LICENSE b/sca-java-1.x/trunk/modules/workspace-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.x/modules/workspace-xml/LICENSE
+++ b/sca-java-1.x/trunk/modules/workspace-xml/LICENSE
diff --git a/branches/sca-java-1.x/modules/workspace-xml/NOTICE b/sca-java-1.x/trunk/modules/workspace-xml/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-1.x/modules/workspace-xml/NOTICE
+++ b/sca-java-1.x/trunk/modules/workspace-xml/NOTICE
diff --git a/branches/sca-java-1.x/modules/workspace-xml/pom.xml b/sca-java-1.x/trunk/modules/workspace-xml/pom.xml
index 1e4257e50d..1e4257e50d 100644
--- a/branches/sca-java-1.x/modules/workspace-xml/pom.xml
+++ b/sca-java-1.x/trunk/modules/workspace-xml/pom.xml
diff --git a/branches/sca-java-1.x/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java b/sca-java-1.x/trunk/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
index d7fc32a1a7..d7fc32a1a7 100644
--- a/branches/sca-java-1.x/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
+++ b/sca-java-1.x/trunk/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java
diff --git a/branches/sca-java-1.x/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java b/sca-java-1.x/trunk/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
index d0665a4ec8..d0665a4ec8 100644
--- a/branches/sca-java-1.x/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
+++ b/sca-java-1.x/trunk/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java
diff --git a/branches/sca-java-1.x/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/trunk/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9ea7874b52..9ea7874b52 100644
--- a/branches/sca-java-1.x/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/trunk/modules/workspace-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.x/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties b/sca-java-1.x/trunk/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
index e054591a31..e054591a31 100644
--- a/branches/sca-java-1.x/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
+++ b/sca-java-1.x/trunk/modules/workspace-xml/src/main/resources/workspace-xml-validation-messages.properties
diff --git a/branches/sca-java-1.x/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java b/sca-java-1.x/trunk/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
index 8e4d30e7a0..8e4d30e7a0 100644
--- a/branches/sca-java-1.x/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
+++ b/sca-java-1.x/trunk/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/workspace/xml/ContributionWorkspaceProcessorTestCase.java
diff --git a/branches/sca-java-1.x/modules/workspace/LICENSE b/sca-java-1.x/trunk/modules/workspace/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.x/modules/workspace/LICENSE
+++ b/sca-java-1.x/trunk/modules/workspace/LICENSE
diff --git a/branches/sca-java-1.x/modules/workspace/NOTICE b/sca-java-1.x/trunk/modules/workspace/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-1.x/modules/workspace/NOTICE
+++ b/sca-java-1.x/trunk/modules/workspace/NOTICE
diff --git a/branches/sca-java-1.x/modules/workspace/pom.xml b/sca-java-1.x/trunk/modules/workspace/pom.xml
index 7b2c5f5358..7b2c5f5358 100644
--- a/branches/sca-java-1.x/modules/workspace/pom.xml
+++ b/sca-java-1.x/trunk/modules/workspace/pom.xml
diff --git a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/ContributionConfiguration.java b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/ContributionConfiguration.java
index bf885644b0..bf885644b0 100644
--- a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/ContributionConfiguration.java
+++ b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/ContributionConfiguration.java
diff --git a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
index e895669d23..e895669d23 100644
--- a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
+++ b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
diff --git a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
index 66f38afec7..66f38afec7 100644
--- a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
+++ b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
diff --git a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
index 2656068bea..2656068bea 100644
--- a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
+++ b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
diff --git a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
index 6fab700243..6fab700243 100644
--- a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
+++ b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
diff --git a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
index e41cc3ea83..e41cc3ea83 100644
--- a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
+++ b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
diff --git a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
index 9e242613eb..9e242613eb 100644
--- a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
+++ b/sca-java-1.x/trunk/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
diff --git a/branches/sca-java-1.x/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory b/sca-java-1.x/trunk/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
index d390d29d90..d390d29d90 100644
--- a/branches/sca-java-1.x/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory
+++ b/sca-java-1.x/trunk/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory