diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:07:45 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:07:45 +0000 |
commit | 6a3ca6736c808c1647854e405ef379b609f276db (patch) | |
tree | 67670193d3511b227100419589d0f2ec0bb02cc0 /sca-java-1.x/branches/sca-java-1.2.1/modules/workspace | |
parent | 9f395ebf3ec27f89c8dc63137bc99c8d6b0cff6d (diff) |
Moving 1.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835126 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE (renamed from branches/sca-java-1.2.1/modules/workspace-admin/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE (renamed from branches/sca-java-1.2.1/modules/workspace-admin/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml (renamed from branches/sca-java-1.2.1/modules/workspace-admin/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png) | bin | 818 -> 818 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml (renamed from branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE (renamed from branches/sca-java-1.2.1/modules/workspace-impl/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE (renamed from branches/sca-java-1.2.1/modules/workspace-impl/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml (renamed from branches/sca-java-1.2.1/modules/workspace-impl/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java (renamed from branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java (renamed from branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java (renamed from branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java (renamed from branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java (renamed from branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE (renamed from branches/sca-java-1.2.1/modules/workspace-xml/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE (renamed from branches/sca-java-1.2.1/modules/workspace-xml/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml (renamed from branches/sca-java-1.2.1/modules/workspace-xml/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java (renamed from branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java (renamed from branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java (renamed from branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER (renamed from branches/sca-java-1.2.1/modules/workspace/DISCLAIMER) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/LICENSE (renamed from branches/sca-java-1.2.1/modules/workspace/LICENSE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/NOTICE (renamed from branches/sca-java-1.2.1/modules/workspace/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/pom.xml (renamed from branches/sca-java-1.2.1/modules/workspace/pom.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory (renamed from branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory) | 0 |
56 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER index d68a410903..d68a410903 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/DISCLAIMER diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/LICENSE diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE index fdfa0e9faa..fdfa0e9faa 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/NOTICE diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml index 13c972156e..13c972156e 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/pom.xml diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java index 787b7aca08..787b7aca08 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/CompositeImageCollectionImpl.java diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java index 6b8541b279..6b8541b279 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/ContributionCollectionImpl.java diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java index 2aeeb14727..2aeeb14727 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java index fe5a3fe7e1..fe5a3fe7e1 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployedCompositeCollectionImpl.java diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java index 39fec24e92..39fec24e92 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DomainAdminUtil.java diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java index 241dc6f55b..241dc6f55b 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileCollectionImpl.java diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java index fe0fc9e415..fe0fc9e415 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/FileServiceImpl.java diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java index 251f6cd410..251f6cd410 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/NodeProcessCollectionFacadeImpl.java diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java index 550f97c2ad..550f97c2ad 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/QuickStartServiceImpl.java diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java index 7b23951aef..7b23951aef 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/launcher/DomainManagerLauncherBootstrap.java diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite index 3f793405b1..3f793405b1 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/DomainManager.composite diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css index aa6e910f85..aa6e910f85 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/admin.css diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html index 193e30bb49..193e30bb49 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/cloud.html diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html index 96cf59c7c2..96cf59c7c2 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/composite.html diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html index d29b913bf5..d29b913bf5 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/files.html diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html index 02b70e688e..02b70e688e 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/home.html diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png Binary files differindex a59728b2ad..a59728b2ad 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/icons/feed-icon.png diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js index 853ce5d235..853ce5d235 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/utils.js diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html index fb00b4c8c1..fb00b4c8c1 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/main/resources/workspace.html diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java index 9fea3445b3..9fea3445b3 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/java/org/apache/tuscany/sca/workspace/admin/impl/AdminTestCase.java diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml index e03da2431b..e03da2431b 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/assets/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml index 48d4be2d6e..48d4be2d6e 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/contributions/store/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml index e6ac7d7701..e6ac7d7701 100644 --- a/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-admin/src/test/resources/workspace.xml diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER index d68a410903..d68a410903 100644 --- a/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/DISCLAIMER diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/LICENSE diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE index fdfa0e9faa..fdfa0e9faa 100644 --- a/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/NOTICE diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml index f2ee87978b..f2ee87978b 100644 --- a/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/pom.xml diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java index 9d96b7783d..9d96b7783d 100644 --- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderImpl.java diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java index 3e715e83a8..3e715e83a8 100644 --- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionContentProcessor.java diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java index 14686753b0..14686753b0 100644 --- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/processor/impl/ContributionInfoProcessor.java diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java index 45ba8c0609..45ba8c0609 100644 --- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/DirectoryContributionScanner.java diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java index 9dd1b3a15b..9dd1b3a15b 100644 --- a/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/scanner/impl/JarContributionScanner.java diff --git a/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java index 55dfdbe10f..55dfdbe10f 100644 --- a/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-impl/src/test/java/org/apache/tuscany/sca/workspace/builder/impl/ContributionDependencyBuilderTestCase.java diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER index d68a410903..d68a410903 100644 --- a/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/DISCLAIMER diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/LICENSE diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE index fdfa0e9faa..fdfa0e9faa 100644 --- a/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/NOTICE diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml index 6c188a7ae7..6c188a7ae7 100644 --- a/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/pom.xml diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java index 16157396c7..16157396c7 100644 --- a/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceDocumentProcessor.java diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java index 2737814cfe..2737814cfe 100644 --- a/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/main/java/org/apache/tuscany/sca/workspace/xml/WorkspaceProcessor.java diff --git a/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java index c09600f5a6..c09600f5a6 100644 --- a/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionWorkspaceProcessorTestCase.java diff --git a/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER index d68a410903..d68a410903 100644 --- a/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/DISCLAIMER diff --git a/branches/sca-java-1.2.1/modules/workspace/LICENSE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/LICENSE index 8aa906c321..8aa906c321 100644 --- a/branches/sca-java-1.2.1/modules/workspace/LICENSE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/LICENSE diff --git a/branches/sca-java-1.2.1/modules/workspace/NOTICE b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/NOTICE index fdfa0e9faa..fdfa0e9faa 100644 --- a/branches/sca-java-1.2.1/modules/workspace/NOTICE +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/NOTICE diff --git a/branches/sca-java-1.2.1/modules/workspace/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/pom.xml index 3bf91e1466..3bf91e1466 100644 --- a/branches/sca-java-1.2.1/modules/workspace/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/pom.xml diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java index e895669d23..e895669d23 100644 --- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java index 6146ccdae2..6146ccdae2 100644 --- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java index 2656068bea..2656068bea 100644 --- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java index f3a7aa22c1..f3a7aa22c1 100644 --- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java index 939733ee34..939733ee34 100644 --- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilderMonitor.java diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java index e41cc3ea83..e41cc3ea83 100644 --- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java index 649faafafa..649faafafa 100644 --- a/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java diff --git a/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory index d390d29d90..d390d29d90 100644 --- a/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory +++ b/sca-java-1.x/branches/sca-java-1.2.1/modules/workspace/src/main/resources/META-INF/services/org.apache.tuscany.sca.workspace.WorkspaceFactory |