You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/07/29 11:13:09 UTC
svn commit: r798818 - in
/tuscany/branches/sca-java-1.x/itest/workspace-manager: pom.xml
src/main/java/org/apache/tuscany/sca/launcher/TestLauncher.java
Author: slaws
Date: Wed Jul 29 09:13:08 2009
New Revision: 798818
URL: http://svn.apache.org/viewvc?rev=798818&view=rev
Log:
TUSCANY-3174 - Fix test to use new workspace manager module
Modified:
tuscany/branches/sca-java-1.x/itest/workspace-manager/pom.xml
tuscany/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/launcher/TestLauncher.java
Modified: tuscany/branches/sca-java-1.x/itest/workspace-manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/workspace-manager/pom.xml?rev=798818&r1=798817&r2=798818&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/workspace-manager/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/itest/workspace-manager/pom.xml Wed Jul 29 09:13:08 2009
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-workspace-impl</artifactId>
+ <artifactId>tuscany-workspace-manager</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
Modified: tuscany/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/launcher/TestLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/launcher/TestLauncher.java?rev=798818&r1=798817&r2=798818&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/launcher/TestLauncher.java (original)
+++ tuscany/branches/sca-java-1.x/itest/workspace-manager/src/main/java/org/apache/tuscany/sca/launcher/TestLauncher.java Wed Jul 29 09:13:08 2009
@@ -38,15 +38,13 @@
import org.apache.tuscany.sca.monitor.Problem.Severity;
import org.apache.tuscany.sca.workspace.Workspace;
import org.apache.tuscany.sca.workspace.manager.WorkspaceManager;
-import org.apache.tuscany.sca.workspace.manager.WorkspaceManagerFactory;
import org.osoa.sca.ServiceRuntimeException;
public class TestLauncher {
public final static void main(String[] args) {
- WorkspaceManagerFactory workspaceManagerFactory = WorkspaceManagerFactory.newInstance();
- WorkspaceManager workspaceManager = workspaceManagerFactory.createWorkspaceManager();
+ WorkspaceManager workspaceManager = WorkspaceManager.newInstance();
addExtensions(workspaceManager);
workspaceManager.start();
@@ -56,7 +54,7 @@
private static void addExtensions(WorkspaceManager workspaceManager) {
try {
- System.out.println("Adding extensions");
+ System.out.println("Add extensions");
ExtensionPointRegistry registry = workspaceManager.getRegistry();
// get monitor
@@ -93,24 +91,13 @@
private static void processContributions(WorkspaceManager workspaceManager){
try {
System.out.println("Process contribution");
- ExtensionPointRegistry registry = workspaceManager.getRegistry();
- ModelFactoryExtensionPoint modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
- ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
-
- Workspace workspace = workspaceManager.createWorkspace();
-
- Contribution contribution = contributionFactory.createContribution();
- contribution.setURI("contrib1");
- contribution.setLocation("./target/classes/contrib1");
- contribution.setUnresolved(true);
- contribution = workspaceManager.addContributionToWorkspace(workspace, contribution);
-
+ Workspace workspace = workspaceManager.createWorkspace();
+ Contribution contribution = workspaceManager.readContribution("contrib1", "./target/classes/contrib1");
+ workspaceManager.addContributionToWorkspace(workspace, contribution);
workspaceManager.resolveWorkspace(workspace);
// do whatever you need to do with workspace and its resolved contributions
-
- workspaceManager.removeContributionFromWorkspace(workspace, contribution);
} catch (Exception ex) {
ex.printStackTrace();