diff options
12 files changed, 446 insertions, 25 deletions
diff --git a/branches/sca-java-1.x/modules/domain-manager/pom.xml b/branches/sca-java-1.x/modules/domain-manager/pom.xml index ba5a221ee5..6c46fe5209 100644 --- a/branches/sca-java-1.x/modules/domain-manager/pom.xml +++ b/branches/sca-java-1.x/modules/domain-manager/pom.xml @@ -187,7 +187,7 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> + <version>2.3</version> </dependency> <dependency> diff --git a/branches/sca-java-1.x/modules/endpoint/pom.xml b/branches/sca-java-1.x/modules/endpoint/pom.xml index ddcf178a76..a77f1fee9a 100644 --- a/branches/sca-java-1.x/modules/endpoint/pom.xml +++ b/branches/sca-java-1.x/modules/endpoint/pom.xml @@ -50,22 +50,27 @@ <version>1.6-SNAPSHOT</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core</artifactId> + <artifactId>tuscany-contribution-impl</artifactId> <version>1.6-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-sca</artifactId> + <artifactId>tuscany-contribution-xml</artifactId> <version>1.6-SNAPSHOT</version> - <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-workspace-impl</artifactId> + <artifactId>tuscany-core</artifactId> + <version>1.6-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-sca</artifactId> <version>1.6-SNAPSHOT</version> <scope>test</scope> </dependency> @@ -89,7 +94,14 @@ <artifactId>tuscany-monitor</artifactId> <version>1.6-SNAPSHOT</version> <scope>test</scope> - </dependency> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-workspace-impl</artifactId> + <version>1.6-SNAPSHOT</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.easymock</groupId> diff --git a/branches/sca-java-1.x/modules/host-embedded/pom.xml b/branches/sca-java-1.x/modules/host-embedded/pom.xml index 3ede75bc6f..cdd06580b8 100644 --- a/branches/sca-java-1.x/modules/host-embedded/pom.xml +++ b/branches/sca-java-1.x/modules/host-embedded/pom.xml @@ -105,14 +105,7 @@ <artifactId>tuscany-host-http</artifactId> <version>1.6-SNAPSHOT</version> <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> + </dependency> </dependencies> diff --git a/branches/sca-java-1.x/modules/node-impl/pom.xml b/branches/sca-java-1.x/modules/node-impl/pom.xml index 0b9c502d5b..e44586d6ec 100644 --- a/branches/sca-java-1.x/modules/node-impl/pom.xml +++ b/branches/sca-java-1.x/modules/node-impl/pom.xml @@ -115,13 +115,6 @@ <version>1.6-SNAPSHOT</version> <scope>runtime</scope> </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> diff --git a/branches/sca-java-1.x/modules/workspace-impl/pom.xml b/branches/sca-java-1.x/modules/workspace-impl/pom.xml index d08880e88c..8769c86421 100644 --- a/branches/sca-java-1.x/modules/workspace-impl/pom.xml +++ b/branches/sca-java-1.x/modules/workspace-impl/pom.xml @@ -58,7 +58,14 @@ <artifactId>tuscany-contribution-namespace</artifactId> <version>1.6-SNAPSHOT</version> <scope>test</scope> - </dependency> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-embedded</artifactId> + <version>1.6-SNAPSHOT</version> + <scope>test</scope> + </dependency> </dependencies> diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerFactoryImpl.java b/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerFactoryImpl.java new file mode 100644 index 0000000000..854069bf0e --- /dev/null +++ b/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerFactoryImpl.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.workspace.manager.impl; + +import org.apache.tuscany.sca.workspace.manager.WorkspaceManager; +import org.apache.tuscany.sca.workspace.manager.WorkspaceManagerFactory; +import org.osoa.sca.ServiceRuntimeException; + + +/** + * A factory for creating workspace managers. A workspace manager has an instance + * of the Tuscany runtime and creates workspaces for collecting and processing + * contributions + */ +public class WorkspaceManagerFactoryImpl extends WorkspaceManagerFactory { + + public WorkspaceManagerFactoryImpl() { + } + + public WorkspaceManager createWorkspaceManager(){ + return new WorkspaceManagerImpl(); + } +} diff --git a/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java b/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java new file mode 100644 index 0000000000..97f1f472f1 --- /dev/null +++ b/branches/sca-java-1.x/modules/workspace-impl/src/main/java/org/apache/tuscany/sca/workspace/manager/impl/WorkspaceManagerImpl.java @@ -0,0 +1,179 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.workspace.manager.impl; + +import java.io.File; +import java.net.URI; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.core.UtilityExtensionPoint; +import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime; +import org.apache.tuscany.sca.monitor.Monitor; +import org.apache.tuscany.sca.monitor.MonitorFactory; +import org.apache.tuscany.sca.monitor.Problem; +import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.workspace.ContributionConfiguration; +import org.apache.tuscany.sca.workspace.Workspace; +import org.apache.tuscany.sca.workspace.WorkspaceFactory; +import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; +import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; +import org.apache.tuscany.sca.workspace.manager.WorkspaceManager; +import org.osoa.sca.ServiceRuntimeException; + +/** + * An SPI for firing up the Tuscany runtime and for providing + * access to the ExtensionPointRegsitry. With a reference to the + * registry you can add new extension points and then start the + * runtime. Once started you can create worksapces and use them + * to read and resolve SCA contributions in the same way that + * Tuscany does internally. + */ +public class WorkspaceManagerImpl implements WorkspaceManager { + + private ReallySmallRuntime runtime; + + private ModelFactoryExtensionPoint modelFactories; + private URLArtifactProcessorExtensionPoint artifactProcessorExtensions; + private UtilityExtensionPoint utilities; + + private WorkspaceFactory workspaceFactory; + private URLArtifactProcessor<Contribution> contributionProcessor; + private ContributionDependencyBuilder contributionDependencyBuilder; + private MonitorFactory monitorFactory; + private Monitor monitor; + + public WorkspaceManagerImpl(){ + try { + runtime = new ReallySmallRuntime(Thread.currentThread().getContextClassLoader()); + + ExtensionPointRegistry registry = getRegistry(); + + modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class); + artifactProcessorExtensions = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); + utilities = registry.getExtensionPoint(UtilityExtensionPoint.class); + + workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); + contributionProcessor = artifactProcessorExtensions.getProcessor(Contribution.class); + monitorFactory = utilities.getUtility(MonitorFactory.class); + monitor = monitorFactory.createMonitor(); + + contributionDependencyBuilder = new ContributionDependencyBuilderImpl(monitor); + + } catch(Exception ex) { + throw new ServiceRuntimeException(ex); + } + } + + public ExtensionPointRegistry getRegistry(){ + return runtime.getExtensionPointRegistry(); + } + + public void start(){ + try { + runtime.start(); + } catch(Exception ex) { + throw new ServiceRuntimeException(ex); + } + } + + public void stop(){ + try { + runtime.stop(); + } catch(Exception ex) { + throw new ServiceRuntimeException(ex); + } + } + + public Workspace createWorkspace(){ + Workspace workspace = workspaceFactory.createWorkspace(); + + workspace.setModelResolver(new ExtensibleModelResolver(workspace, getRegistry())); + + return workspace; + } + + public Contribution addContributionToWorkspace(Workspace workspace, Contribution contribution){ + try { + Contribution returnContribution = contributionProcessor.read(null, + URI.create(contribution.getURI()), + new File(contribution.getLocation()).toURI().toURL()); + + workspace.getContributions().add(returnContribution); + + analyzeProblems(); + + return returnContribution; + + } catch (Exception ex) { + throw new ServiceRuntimeException(ex); + } + } + + public void resolveWorkspace(Workspace workspace){ + try { + // some algorithm to resolve contributions given their dependencies + // need to look at the one from 2.x as this one expects contributions + // presented in the right order + Set<Contribution> resolved = new HashSet<Contribution>(); + for (Contribution contribution: workspace.getContributions()) { + List<Contribution> dependencies = contributionDependencyBuilder.buildContributionDependencies(contribution, workspace); + + // Resolve contributions + for (Contribution dependency: dependencies) { + if (!resolved.contains(dependency)) { + resolved.add(dependency); + contributionProcessor.resolve(contribution, workspace.getModelResolver()); + } + } + } + + analyzeProblems(); + + } catch (Exception ex) { + throw new ServiceRuntimeException(ex); + } + } + + public void removeContributionFromWorkspace(Workspace workspace, Contribution contribution){ + workspace.getContributions().remove(contribution); + } + + private void analyzeProblems() throws Exception { + + for (Problem problem : monitor.getProblems()) { + if ((problem.getSeverity() == Severity.ERROR) && (!problem.getMessageId().equals("SchemaError"))) { + if (problem.getCause() != null) { + throw problem.getCause(); + } else { + throw new ServiceRuntimeException(problem.toString()); + } + } + } + } + +} diff --git a/branches/sca-java-1.x/modules/workspace/pom.xml b/branches/sca-java-1.x/modules/workspace/pom.xml index 7b2c5f5358..c4fd5261b1 100644 --- a/branches/sca-java-1.x/modules/workspace/pom.xml +++ b/branches/sca-java-1.x/modules/workspace/pom.xml @@ -29,6 +29,12 @@ <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/ContributionConfiguration.java b/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/ContributionConfiguration.java new file mode 100644 index 0000000000..bf885644b0 --- /dev/null +++ b/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/ContributionConfiguration.java @@ -0,0 +1,54 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tuscany.sca.workspace; + +/** + * Represents an SCA contribution uri + location. + */ +public final class ContributionConfiguration { + private String uri; + private String location; + + /** + * Constructs a new SCA contribution. + * + * @param uri The URI that uniquely identifies the contribution in the SCA domain + * @param location The URL of the contribution archive + */ + public ContributionConfiguration(String uri, String location) { + this.uri = uri; + this.location = location; + } + + /** + * Get the URI of the contribution + * @return The URI that uniquely identifies the contribution in the SCA domain + */ + public String getURI() { + return uri; + } + + /** + * The location of the contribution + * @return The URL of the contribution archive + */ + public String getLocation() { + return location; + } +}
\ No newline at end of file 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 e41cc3ea83..99ecbb4c0c 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 { - protected WorkspaceFactoryImpl() { + public WorkspaceFactoryImpl() { } public Workspace createWorkspace() { diff --git a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java b/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java new file mode 100644 index 0000000000..c7b464ac74 --- /dev/null +++ b/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManager.java @@ -0,0 +1,90 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.workspace.manager; + +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.workspace.ContributionConfiguration; +import org.apache.tuscany.sca.workspace.Workspace; + +/** + * An SPI for firing up the Tuscany runtime and for providing + * access to the ExtensionPointRegsitry. With a reference to the + * registry you can add new extension points and then start the + * runtime. Once started you can create worksapces and use them + * to read and resolve SCA contributions in the same way that + * Tuscany does internally. + */ +public interface WorkspaceManager { + + /** + * If you want to add new extensions to the extension point + * registry and have the runtime take notice of them you need + * to do this before calling start + */ + public ExtensionPointRegistry getRegistry(); + + /** + * Starting the runtime creates the extensible model processors and + * resolvers based on the extension points currently found in the + * extension point registry. + */ + public void start(); + + /** + * Remove any resources being held by the runtime + */ + public void stop(); + + /** + * Create an empty workspace + * + * @return workspace + */ + public Workspace createWorkspace(); + + // should the following operations be on the manager or on the workspace itself + + /** + * Add a contribution to a workspace and create the contribution model in the process + * + * @param workspace the workspace to be extended + * @param contribution the configuration information of the contribution to be added + */ + public Contribution addContributionToWorkspace(Workspace workspace, Contribution contribution); + + // Should we have an operation that allows a whole workspace to be created at once + // programmatically from a configuration ? + + /** + * Resolve all of the contributions in the workspace + * + * @param workspace + */ + public void resolveWorkspace(Workspace workspace); + + /** + * Remove a contribution from the workspace + * + * @param workspace the workspace to be changes + * @param contribution the contribution to be removed + */ + public void removeContributionFromWorkspace(Workspace workspace, Contribution contribution); +} diff --git a/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManagerFactory.java b/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManagerFactory.java new file mode 100644 index 0000000000..25cd6b3a12 --- /dev/null +++ b/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/manager/WorkspaceManagerFactory.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.workspace.manager; + +import org.osoa.sca.ServiceRuntimeException; + + +/** + * A factory for creating workspace managers. A workspace manager has an instance + * of the Tuscany runtime and creates workspaces for collecting and processing + * contributions + */ +public abstract class WorkspaceManagerFactory { + + /** + * Get a new instance of the WorkspaceManagerFactory. Each call will create a + * new factory instance + * @return workspace manager factory + */ + public static WorkspaceManagerFactory newInstance(){ + try { + Class<?> workspaceManagerFactoryImplClass = Class.forName("org.apache.tuscany.sca.workspace.manager.impl.WorkspaceManagerFactoryImpl"); + return (WorkspaceManagerFactory)workspaceManagerFactoryImplClass.newInstance(); + } catch(Exception ex){ + throw new ServiceRuntimeException(ex); + } + } + + public abstract WorkspaceManager createWorkspaceManager(); +} |