summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/modules/workspace
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-10-26 23:44:59 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-10-26 23:44:59 +0000
commit71a7cba384b8ae7f4578fb9ab1f725d5ce616074 (patch)
tree98bbc7c066d037a8d9ea1fea7a3ccfa64419ab11 /branches/sca-java-1.x/modules/workspace
parent01a38d872dc2692d2a31f07f9c8f8098aa078853 (diff)
Merge all changes from 1.5.2 branch into trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/modules/workspace')
-rw-r--r--branches/sca-java-1.x/modules/workspace/pom.xml6
-rw-r--r--branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java2
2 files changed, 1 insertions, 7 deletions
diff --git a/branches/sca-java-1.x/modules/workspace/pom.xml b/branches/sca-java-1.x/modules/workspace/pom.xml
index c4fd5261b1..7b2c5f5358 100644
--- a/branches/sca-java-1.x/modules/workspace/pom.xml
+++ b/branches/sca-java-1.x/modules/workspace/pom.xml
@@ -29,12 +29,6 @@
<name>Apache Tuscany SCA Domain Workspace Model</name>
<dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.6-SNAPSHOT</version>
- </dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution</artifactId>
diff --git a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
index 99ecbb4c0c..e41cc3ea83 100644
--- a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
+++ b/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
@@ -30,7 +30,7 @@ import org.apache.tuscany.sca.workspace.WorkspaceFactory;
*/
public class WorkspaceFactoryImpl implements WorkspaceFactory {
- public WorkspaceFactoryImpl() {
+ protected WorkspaceFactoryImpl() {
}
public Workspace createWorkspace() {